# 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

Changes

@@ -16,6 +16,7 @@ Anope Version  S V N
 03/03 F SAs can no longer move other SAs down to ServicesOpers.           [#690]
 03/03 F We now send out UNKLINE on hybrid when /os akill del is issued.   [#656]
 03/14 F /os modunload dosnt clear moduleData before calling AnopeFini.    [ #00]
+03/18 F DefCon's AKILL will now honor the server's sync flag.             [#643]
 
 Anope Version 1.7.18
 --------------------

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);

version.log

@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="18"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="1234"
+VERSION_BUILD="1235"
 
 # $Log$
 #
+# BUILD : 1.7.18 (1235)
+# BUGS  : 643
+# NOTES : Defcon's AKILL will now honor the server's sync flag
+#
 # BUILD : 1.7.18 (1234)
 # BUGS  : 680 681
 # NOTES : typos in en_us.l