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

Changes

@@ -58,6 +58,7 @@ Provided by Johno Crawford <johno.crawford@gmail.com> - 2008
 02/08 F x86_64 generating improper SHA1 hash values.                      [#856]
 
 Provided by Jan Milants <jan_renee@msn.com> - 2008
+07/20 F DEFCON was akilling ulined servers clients.                       [#899]
 07/20 F Botserv replying with /(null).                                    [#894]
 07/20 F Anope will not limit sessions for ulined servers.                 [#909]
 07/20 F EVENT_BOT_KICK not being send under all circumstances             [#910]

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

version.log

@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="21"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="1401"
+VERSION_BUILD="1402"
 
 # $Log$
 #
+# BUILD : 1.7.21 (1402)
+# BUGS  : 899
+# NOTES : DEFCON was akilling ulined servers clients. Thanks Jan
+#
 # BUILD : 1.7.21 (1401)
 # BUGS  : 894
 # NOTES : Botserv replying with /(null). Thanks Jan