summaryrefslogtreecommitdiff
path: root/src/users.c
diff options
context:
space:
mode:
authordrstein drstein@31f1291d-b8d6-0310-a050-a5561fc1590b <drstein drstein@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2008-07-20 20:51:37 +0000
committerdrstein drstein@31f1291d-b8d6-0310-a050-a5561fc1590b <drstein drstein@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2008-07-20 20:51:37 +0000
commitcc4c1e7d2f35b6f48fd10a4bee48e8f070fd88f1 (patch)
tree44f6498a95a4b808e994d0733a7612582b2308fc /src/users.c
parenta5da1eb1fa11a1e92cf5cbdb317ba7bcbe426960 (diff)
BUILD : 1.7.21 (1402) BUGS : 899 NOTES : DEFCON was akilling ulined servers clients. Thanks Jan
git-svn-id: svn://svn.anope.org/anope/trunk@1402 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1117 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src/users.c')
-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);