summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/users.c2
-rw-r--r--version.log7
2 files changed, 8 insertions, 1 deletions
diff --git a/src/users.c b/src/users.c
index f5c0c4160..e46c07d5a 100644
--- a/src/users.c
+++ b/src/users.c
@@ -934,8 +934,10 @@ int is_excepted(ChannelInfo * ci, User * user)
if (match_usermask(excepts[i], user)
|| (hostip && match_userip(excepts[i], user, hostip))) {
isexcepted = 1;
+ break;
}
}
+ Anope_Free(hostip);
free(excepts);
return isexcepted;
}
diff --git a/version.log b/version.log
index 98694d359..ef8858963 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,15 @@ VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="19"
VERSION_EXTRA="-svn"
-VERSION_BUILD="1293"
+VERSION_BUILD="1294"
# $Log$
#
+# BUILD : 1.7.19 (1294)
+# BUGS : N/A
+# NOTES : in is_excepted() if we found the exception, break(). There is no point on continue exploring the
+# array. Also, I forgot to free hostip in my previous commit.
+#
# BUILD : 1.7.19 (1293)
# BUGS : 778
# NOTES : is_excepted() now uses match_userip() also.