Use GLINE_IGNORE_TRUSTS when calling glineby* from trusts code.

--HG--
branch : shroudtrusts

diff --git a/glines/glines.h b/glines/glines.h
index 19dbabad4ec9db0e554de0293fef85d63980c042..109059a175c9a311863b87f7fbf6555396405c71 100644 (file)
--- a/glines/glines.h
+++ b/glines/glines.h
@@ -1,7 +1,7 @@
 #ifndef __GLINES_H
 #define __GLINES_H
 
-#define MAXGLINEUSERS        2
+#define MAXGLINEUSERS        100
 
 #define GLINE_IGNORE_TRUST   1
 #define GLINE_ALWAYS_USER    2

diff --git a/trusts/trusts_policy.c b/trusts/trusts_policy.c
index 73dca71ba891202b17f49b3c1a80218ca37ad4dc..b7c96e02ce80332a23169416038123361ab0d6cb 100644 (file)
--- a/trusts/trusts_policy.c
+++ b/trusts/trusts_policy.c
@@ -37,7 +37,7 @@ static void policycheck(int hooknum, void *arg) {
     controlwall(NO_OPER, NL_TRUSTS, "Hard connection limit exceeded on IP: %s (group: %s) %d connected, %d max.", IPtostr(np->p_ipaddr), tg->name->content, nodecount, th->maxpernode);
 
     if(enforcepolicy)
-      glinebynick(np, POLICY_GLINE_DURATION, "Too many connections from your host.", 0);
+      glinebynick(np, POLICY_GLINE_DURATION, "Too many connections from your host.", GLINE_IGNORE_TRUST);
 
     return;
   }
@@ -65,7 +65,7 @@ static void policycheck(int hooknum, void *arg) {
       controlwall(NO_OPER, NL_TRUSTS, "Ident required: '%s' %s!%s@%s.", tg->name->content, np->nick, np->ident, np->host->name->content);
 
       if (enforcepolicy)
-        glinebynick(np, POLICY_GLINE_DURATION, "IDENT required from your host.", GLINE_ALWAYS_USER);
+        glinebynick(np, POLICY_GLINE_DURATION, "IDENT required from your host.", GLINE_ALWAYS_USER|GLINE_IGNORE_TRUST);
     }
 
     if(tg->maxperident > 0) {
@@ -84,7 +84,7 @@ static void policycheck(int hooknum, void *arg) {
         controlwall(NO_OPER, NL_TRUSTS, "Hard ident limit exceeded: '%s' %s!%s@%s, %d connected, %d max.", tg->name->content, np->nick, np->ident, np->host->name->content, identcount, tg->maxperident);
 
         if (enforcepolicy)
-          glinebynick(np, POLICY_GLINE_DURATION, "Too many connections from your user.", GLINE_ALWAYS_USER);
+          glinebynick(np, POLICY_GLINE_DURATION, "Too many connections from your user.", GLINE_ALWAYS_USER|GLINE_IGNORE_TRUST);
       }
     }
   } else {