From de39a0e8a7e97d3e983a078444cfe744a3c77ac6 Mon Sep 17 00:00:00 2001 From: "certus certus@31f1291d-b8d6-0310-a050-a5561fc1590b" Date: Sun, 18 Mar 2007 23:23:33 +0000 Subject: # BUILD : 1.7.18 (1235) # BUGS : 643 # NOTES : Defcon's AKILL will now honor the server's sync flag git-svn-id: svn://svn.anope.org/anope/trunk@1235 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@954 5417fbe8-f217-4b02-8779-1006273d7864 --- src/users.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/users.c b/src/users.c index 11d8410b1..fb586e779 100644 --- a/src/users.c +++ b/src/users.c @@ -569,7 +569,8 @@ User *do_nick(const char *source, char *nick, char *username, char *host, * DefCon AKILL system, if we want to akill all connecting user's here's where to do it * then force check_akill again on them... **/ - if (checkDefCon(DEFCON_AKILL_NEW_CLIENTS)) { + // don't akill on netmerges -Certus + if (is_sync(findserver(servlist, server)) && checkDefCon(DEFCON_AKILL_NEW_CLIENTS)) { strncpy(mask, "*@", 3); strncat(mask, host, HOSTMAX); alog("DEFCON: adding akill for %s", mask); -- cgit