summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/users.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/users.c b/src/users.c
index 9aab2b2cb..a82a52a50 100644
--- a/src/users.c
+++ b/src/users.c
@@ -576,8 +576,9 @@ User *do_nick(const char *source, char *nick, char *username, char *host,
* then force check_akill again on them...
**/
/* don't akill on netmerges -Certus */
+ /* don't akill clients introduced by ulines. -Viper */
if (is_sync(findserver(servlist, server))
- && checkDefCon(DEFCON_AKILL_NEW_CLIENTS)) {
+ && checkDefCon(DEFCON_AKILL_NEW_CLIENTS) && !is_ulined(server)) {
strncpy(mask, "*@", 3);
strncat(mask, host, HOSTMAX);
alog("DEFCON: adding akill for %s", mask);