BUILD : 1.7.21 (1399) BUGS : 909 NOTES : Anope will not limit sessions for ulined servers. Thanks Jan

git-svn-id: svn://svn.anope.org/anope/trunk@1399 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1114 5417fbe8-f217-4b02-8779-1006273d7864

3 files changed, 10 insertions, 4 deletions

diff --git a/Changes b/Changes
index 73836d572..1044dc9bd 100644
--- a/Changes
+++ b/Changes
@@ -55,6 +55,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 Anope will not limit sessions for ulined servers.                 [#909]
 07/20 F EVENT_BOT_KICK not being send under all circumstances             [#910]
 01/16 F Server traversion with next_server() failed to list all servers.  [#831]
 02/08 F Removed excessive free in ChanServ AKICK code.                    [#849]
diff --git a/src/users.c b/src/users.c
index 14953d6d7..9aab2b2cb 100644
--- a/src/users.c
+++ b/src/users.c
@@ -608,7 +608,8 @@ User *do_nick(const char *source, char *nick, char *username, char *host,
                 return NULL;
         }
         /* Now check for session limits */
-        if (LimitSessions && !add_session(nick, host, ipbuf))
+        if (LimitSessions && !is_ulined(server)
+            && !add_session(nick, host, ipbuf))
             return NULL;
 
         /* Allocate User structure and fill it in. */
@@ -843,7 +844,7 @@ void do_quit(const char *source, int ac, char **av)
             free(na->last_quit);
         na->last_quit = *av[0] ? sstrdup(av[0]) : NULL;
     }
-    if (LimitSessions) {
+    if (LimitSessions && !is_ulined(user->server)) {
         del_session(user->host);
     }
     delete_user(user);
@@ -880,7 +881,7 @@ void do_kill(char *nick, char *msg)
         na->last_quit = *msg ? sstrdup(msg) : NULL;
 
     }
-    if (LimitSessions) {
+    if (LimitSessions && !is_ulined(user->server)) {
         del_session(user->host);
     }
     delete_user(user);
diff --git a/version.log b/version.log
index 47728f8cc..5ac90696b 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="1398"
+VERSION_BUILD="1399"
 
 # $Log$
 #
+# BUILD : 1.7.21 (1399)
+# BUGS  : 909
+# NOTES : Anope will not limit sessions for ulined servers. Thanks Jan
+#
 # BUILD : 1.7.21 (1398)
 # BUGS  : 910
 # NOTES : EVENT_BOT_KICK not being send under all circumstances. Thanks to Jan Milants for reporting and fixing.