BUILD : 1.7.19 (1293) BUGS : 778 NOTES : is_excepted() now uses match_userip() also.

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


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

Changes

@@ -3,6 +3,7 @@ Anope Version  S V N
 08/30 A Added support for channel keys to UnrealIRCd 3.2 SVSJOIN command  [#774]
 08/29 A Session limit exceptions now support IP numbers as hostmask       [#723]
 08/29 A Added InspIRCd11 vIdent support.                                  [#684]
+08/31 F is_excepted() now uses match_userip() also.                       [#778]
 08/31 F Wrong reply when deleting entries by number (akick, badwords)     [#776]
 06/15 F Non-existing servers being SQUIT'd when they were juped.          [#726]
 06/15 F Back online notice being sent to juped servers.                   [#726]

src/users.c

@@ -915,6 +915,7 @@ int is_excepted(ChannelInfo * ci, User * user)
     int count, i;
     int isexcepted = 0;
     char **excepts;
+    char *hostip = NULL;
 
     if (!ci->c)
         return 0;
@@ -927,8 +928,11 @@ int is_excepted(ChannelInfo * ci, User * user)
     excepts = scalloc(sizeof(char *) * count, 1);
     memcpy(excepts, ci->c->excepts, sizeof(char *) * count);
 
+    hostip = host_resolve(user->host);
+
     for (i = 0; i < count; i++) {
-        if (match_usermask(excepts[i], user)) {
+        if (match_usermask(excepts[i], user)
+            || (hostip && match_userip(excepts[i], user, hostip))) {
             isexcepted = 1;
         }
     }

version.log

@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="19"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="1292"
+VERSION_BUILD="1293"
 
 # $Log$
 #
+# BUILD : 1.7.19 (1293)
+# BUGS  : 778
+# NOTES : is_excepted() now uses match_userip() also.
+#
 # BUILD : 1.7.19 (1292)
 # BUGS  : 776
 # NOTES : Fixed wrong reply when deleting entries by number (akick, badwords)