Finish the T bug fix.

diff --git a/trojanscan/trojanscan.c b/trojanscan/trojanscan.c
index a08c2e77ff56cde881dc33a5be78c1c7926127d6..f68304646873dcce8adf5472f2cc5555b230e04b 100644 (file)
--- a/trojanscan/trojanscan.c
+++ b/trojanscan/trojanscan.c
@@ -1971,13 +1971,14 @@ void trojanscan_phrasematch(channel *chp, nick *sender, trojanscan_phrases *phra
   if (worm->monitor) {
     glining = 0;
     usercount = -1;
-  } else if (worm->glinehost && (sender->ipnode->usercount <= TROJANSCAN_MAX_HOST_GLINE)) {
+  } else if (worm->glinehost) {
     snprintf(glinemask, sizeof(glinemask) - 1, "*@%s", IPtostr(sender->p_ipaddr));
     for (j=0;j<NICKHASHSIZE;j++)
       for (np=nicktable[j];np;np=np->next)
         if (np->ipnode==sender->ipnode)
           usercount++;
-  } else if (worm->glineuser || (worm->glinehost && sender->ipnode->usercount > TROJANSCAN_MAX_HOST_GLINE)) {
+  }
+  if (worm->glineuser || (worm->glinehost && usercount > TROJANSCAN_MAX_HOST_GLINE)) {
     userbit = sender->ident;
 /*
     if(userbit[0] == '~')

diff --git a/trojanscan/trojanscan.h b/trojanscan/trojanscan.h
index cfe9856824b0fbf3eceec46615fb7d6f7b022459..3ff26be62c7cc00ff013375ebcea79f955bbd3b4 100644 (file)
--- a/trojanscan/trojanscan.h
+++ b/trojanscan/trojanscan.h
@@ -18,7 +18,7 @@
 #include <ctype.h>
 #include <strings.h>
 
-#define TROJANSCAN_VERSION "2.67"
+#define TROJANSCAN_VERSION "2.68"
 
 #define TROJANSCAN_MAX_HOST_GLINE   5