Second parameter to find_tkline_match() can now be used to skip

soft ban checking. Necessary for blacklist module.

diff --git a/include/h.h b/include/h.h
index 5c6a21f9adf41e0ede3a23192818628fef76ba12..c2709a296fc25b3def91ff8d1007fa6187402d41 100644 (file)
--- a/include/h.h
+++ b/include/h.h
@@ -625,7 +625,7 @@ extern MODVAR aTKline *(*tkl_del_line)(aTKline *tkl);
 extern MODVAR void (*tkl_check_local_remove_shun)(aTKline *tmp);
 extern MODVAR aTKline *(*tkl_expire)(aTKline * tmp);
 extern MODVAR EVENT((*tkl_check_expire));
-extern MODVAR int (*find_tkline_match)(aClient *cptr, int xx);
+extern MODVAR int (*find_tkline_match)(aClient *cptr, int skip_soft);
 extern MODVAR int (*find_shun)(aClient *cptr);
 extern MODVAR int (*find_spamfilter_user)(aClient *sptr, int flags);
 extern MODVAR aTKline *(*find_qline)(aClient *cptr, char *nick, int *ishold);

diff --git a/src/modules/m_tkl.c b/src/modules/m_tkl.c
index cdb4c6fddc1eccb3f12119ed97cc6fdd467ceaa8..164f4f0159ac53edde9eff88454ad411f516cd0d 100644 (file)
--- a/src/modules/m_tkl.c
+++ b/src/modules/m_tkl.c
@@ -58,7 +58,7 @@ aTKline *_tkl_del_line(aTKline *tkl);
 static void _tkl_check_local_remove_shun(aTKline *tmp);
 aTKline *_tkl_expire(aTKline * tmp);
 EVENT(_tkl_check_expire);
-int _find_tkline_match(aClient *cptr, int xx);
+int _find_tkline_match(aClient *cptr, int skip_soft);
 int _find_shun(aClient *cptr);
 int _find_spamfilter_user(aClient *sptr, int flags);
 aTKline *_find_qline(aClient *cptr, char *nick, int *ishold);
@@ -1199,7 +1199,7 @@ EVENT(_tkl_check_expire)
  * @retval <0 if client is banned (user is killed, don't touch 'cptr' anymore),
  *         otherwise the client is not banned (either no match or on an exception list).
  */
-int  _find_tkline_match(aClient *cptr, int xx)
+int  _find_tkline_match(aClient *cptr, int skip_soft)
 {
        aTKline *lp;
        char msge[1024];
@@ -1220,7 +1220,10 @@ int  _find_tkline_match(aClient *cptr, int xx)
                        
                        if ((lp->type & TKL_SHUN) || (lp->type & TKL_SPAMF) || (lp->type & TKL_NICK))
                                continue;
-                       
+
+                       if (skip_soft && (lp->subtype & TKL_SUBTYPE_SOFT))
+                               continue;
+
                        snprintf(uhost, sizeof(uhost), "%s@%s", lp->usermask, lp->hostmask);
 
                        if (match_user(uhost, cptr, MATCH_CHECK_REAL))
@@ -1271,7 +1274,7 @@ int  _find_tkline_match(aClient *cptr, int xx)
                        return 1; /* user is authenticated via SASL, thus exempt. */
        }
 
-       if ((lp->type & TKL_KILL) && (xx != 2))
+       if (lp->type & TKL_KILL)
        {
                if (lp->type & TKL_GLOBAL)
                {