BUILD : 1.7.6 (475) BUGS : 126 NOTES : Some valgrind clean up, should fix 126

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


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

1 files changed, 21 insertions, 5 deletions

diff --git a/src/operserv.c b/src/operserv.c
index 900a828fb..f64aca4f9 100644
--- a/src/operserv.c
+++ b/src/operserv.c
@@ -2075,20 +2075,30 @@ int check_akill(char *nick, const char *username, const char *host,
         if (!ak)
             continue;
         if (match_wild_nocase(ak->user, username)
-            && (match_wild_nocase(ak->host, host)
-                || (vhost && match_wild_nocase(ak->host, vhost)))) {
+            && match_wild_nocase(ak->host, host)) {
             anope_cmd_akill(ak->user, ak->host, ak->by, ak->seton,
                             ak->expires, ak->reason);
             return 1;
         }
+        if (ircd->vhost) {
+            if (vhost) {
+                if (match_wild_nocase(ak->user, username)
+                    && match_wild_nocase(ak->host, vhost)) {
+                    anope_cmd_akill(ak->user, ak->host, ak->by, ak->seton,
+                                    ak->expires, ak->reason);
+                    return 1;
+                }
+            }
+        }
         if (ircd->nickip) {
-            if (ip)
+            if (ip) {
                 if (match_wild_nocase(ak->user, username)
                     && match_wild_nocase(ak->host, ip)) {
                     anope_cmd_akill(ak->user, ak->host, ak->by, ak->seton,
                                     ak->expires, ak->reason);
                     return 1;
                 }
+            }
         }
 
     }
@@ -3497,13 +3507,19 @@ int check_szline(char *nick, char *ip)
     int i;
     SXLine *sx;
 
-    if (szlines.count == 0)
+    if (szlines.count == 0) {
         return 0;
+    }
+
+    if (!ip) {
+        return 0;
+    }
 
     for (i = 0; i < szlines.count; i++) {
         sx = szlines.list[i];
-        if (!sx)
+        if (!sx) {
             continue;
+        }
 
         if (match_wild_nocase(sx->mask, ip)) {
             anope_cmd_szline(sx->mask, sx->reason, sx->by);