summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changes1
-rw-r--r--src/users.c3
-rw-r--r--version.log6
3 files changed, 8 insertions, 2 deletions
diff --git a/Changes b/Changes
index ac5f89e67..45a0e5f1d 100644
--- a/Changes
+++ b/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]
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);
diff --git a/version.log b/version.log
index cf555c389..077808e4c 100644
--- a/version.log
+++ b/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