Allow /ojoin !#channel/%#channel, if admin/halfop are enabled.

[irc/rqf/shadowircd.git] / modules / m_kline.c

diff --git a/modules/m_kline.c b/modules/m_kline.c
index c532c0adaca6242957867f3b5d4164b0c0755253..89ba2353344abf36250841176cc4144a36addf53 100644 (file)
--- a/modules/m_kline.c
+++ b/modules/m_kline.c
@@ -71,7 +71,6 @@ DECLARE_MODULE_AV1(kline, NULL, NULL, kline_clist, NULL, NULL, "$Revision$");
 static int find_user_host(struct Client *source_p, const char *userhost, char *user, char *host);
 static int valid_comment(struct Client *source_p, char *comment);
 static int valid_user_host(struct Client *source_p, const char *user, const char *host);
-static int valid_wild_card(struct Client *source_p, const char *user, const char *host);
 
 static void handle_remote_kline(struct Client *source_p, int tkline_time,
                                const char *user, const char *host, const char *reason);
@@ -108,7 +107,7 @@ mo_kline(struct Client *client_p, struct Client *source_p, int parc, const char
        struct ConfItem *aconf;
        int tkline_time = 0;
        int loc = 1;
-       int propagated = 1;
+       int propagated = ConfigFileEntry.use_propagated_bans;
 
        if(!IsOperK(source_p))
        {
@@ -168,9 +167,18 @@ mo_kline(struct Client *client_p, struct Client *source_p, int parc, const char
                                "%lu %s %s :%s", tkline_time, user, host, reason);
 
        if(!valid_user_host(source_p, user, host) ||
-          !valid_wild_card(source_p, user, host) || !valid_comment(source_p, reason))
+          !valid_comment(source_p, reason))
                return 0;
 
+       if(!valid_wild_card(user, host))
+       {
+               sendto_one_notice(source_p,
+                                 ":Please include at least %d non-wildcard "
+                                 "characters with the user@host",
+                                 ConfigFileEntry.min_nonwildcard);
+               return 0;
+       }
+
        if(propagated && tkline_time == 0)
        {
                sendto_one_notice(source_p, ":Cannot set a permanent global ban");
@@ -280,9 +288,18 @@ handle_remote_kline(struct Client *source_p, int tkline_time,
                return;
 
        if(!valid_user_host(source_p, user, host) ||
-          !valid_wild_card(source_p, user, host) || !valid_comment(source_p, reason))
+          !valid_comment(source_p, reason))
                return;
 
+       if(!valid_wild_card(user, host))
+       {
+               sendto_one_notice(source_p,
+                                 ":Please include at least %d non-wildcard "
+                                 "characters with the user@host",
+                                 ConfigFileEntry.min_nonwildcard);
+               return;
+       }
+
        if(already_placed_kline(source_p, user, host, tkline_time))
                return;
 
@@ -567,32 +584,11 @@ static void
 apply_prop_kline(struct Client *source_p, struct ConfItem *aconf,
             const char *reason, const char *oper_reason, int tkline_time)
 {
-       rb_dlink_node *ptr;
-       struct ConfItem *oldconf;
-
        aconf->flags |= CONF_FLAGS_MYOPER | CONF_FLAGS_TEMPORARY;
        aconf->hold = rb_current_time() + tkline_time;
        aconf->lifetime = aconf->hold;
 
-       ptr = find_prop_ban(aconf->status, aconf->user, aconf->host);
-       if(ptr != NULL)
-       {
-               oldconf = ptr->data;
-               /* Remember at least as long as the old one. */
-               if(oldconf->lifetime > aconf->lifetime)
-                       aconf->lifetime = oldconf->lifetime;
-               /* Force creation time to increase. */
-               if(oldconf->created >= aconf->created)
-                       aconf->created = oldconf->created + 1;
-               /* Leave at least one second of validity. */
-               if(aconf->hold <= aconf->created)
-                       aconf->hold = aconf->created + 1;
-               if(aconf->lifetime < aconf->hold)
-                       aconf->lifetime = aconf->hold;
-               /* Tell deactivate_conf() to destroy it. */
-               oldconf->lifetime = rb_current_time();
-               deactivate_conf(oldconf, ptr);
-       }
+       replace_old_ban(aconf);
 
        rb_dlinkAddAlloc(aconf, &prop_bans);
        add_conf_by_address(aconf->host, CONF_KILL, aconf->user, NULL, aconf);
@@ -695,65 +691,6 @@ valid_user_host(struct Client *source_p, const char *luser, const char *lhost)
        return 1;
 }
 
-/* valid_wild_card()
- * 
- * input        - user buffer, host buffer
- * output       - 0 if invalid, 1 if valid
- * side effects -
- */
-static int
-valid_wild_card(struct Client *source_p, const char *luser, const char *lhost)
-{
-       const char *p;
-       char tmpch;
-       int nonwild = 0;
-       int bitlen;
-
-       /* user has no wildcards, always accept -- jilles */
-       if(!strchr(luser, '?') && !strchr(luser, '*'))
-               return 1;
-
-       /* check there are enough non wildcard chars */
-       p = luser;
-       while((tmpch = *p++))
-       {
-               if(!IsKWildChar(tmpch))
-               {
-                       /* found enough chars, return */
-                       if(++nonwild >= ConfigFileEntry.min_nonwildcard)
-                               return 1;
-               }
-       }
-
-       /* try host, as user didnt contain enough */
-       /* special case for cidr masks -- jilles */
-       if((p = strrchr(lhost, '/')) != NULL && IsDigit(p[1]))
-       {
-               bitlen = atoi(p + 1);
-               /* much like non-cidr for ipv6, rather arbitrary for ipv4 */
-               if(bitlen > 0
-                  && bitlen >=
-                  (strchr(lhost, ':') ? 4 * (ConfigFileEntry.min_nonwildcard - nonwild) : 6 -
-                   2 * nonwild))
-                       return 1;
-       }
-       else
-       {
-               p = lhost;
-               while((tmpch = *p++))
-               {
-                       if(!IsKWildChar(tmpch))
-                               if(++nonwild >= ConfigFileEntry.min_nonwildcard)
-                                       return 1;
-               }
-       }
-
-       sendto_one_notice(source_p,
-                         ":Please include at least %d non-wildcard "
-                         "characters with the user@host", ConfigFileEntry.min_nonwildcard);
-       return 0;
-}
-
 /*
  * valid_comment
  * inputs      - pointer to client