Add ipv4-in-ipv6 logic to check_one_kline

[solanum.git] / ircd / chmode.c

diff --git a/ircd/chmode.c b/ircd/chmode.c
index 9f2cc88b018cb07db0d71255bc4ef1df22ebc18e..591843b555de648882b13c02016815f91e102e61 100644 (file)
--- a/ircd/chmode.c
+++ b/ircd/chmode.c
@@ -253,7 +253,7 @@ add_id(struct Client *source_p, struct Channel *chptr, const char *banid, const
         */
        if(MyClient(source_p))
        {
-               if((rb_dlink_list_length(&chptr->banlist) + rb_dlink_list_length(&chptr->exceptlist) + rb_dlink_list_length(&chptr->invexlist) + rb_dlink_list_length(&chptr->quietlist)) >= (unsigned long)(chptr->mode.mode & MODE_EXLIMIT ? ConfigChannel.max_bans_large : ConfigChannel.max_bans))
+               if((rb_dlink_list_length(&chptr->banlist) + rb_dlink_list_length(&chptr->exceptlist) + rb_dlink_list_length(&chptr->invexlist) + rb_dlink_list_length(&chptr->quietlist)) >= (unsigned long)((chptr->mode.mode & MODE_EXLIMIT) ? ConfigChannel.max_bans_large : ConfigChannel.max_bans))
                {
                        sendto_one(source_p, form_str(ERR_BANLISTFULL),
                                   me.name, source_p->name, chptr->chname, realban);
@@ -822,7 +822,6 @@ chm_ban(struct Client *source_p, struct Channel *chptr,
        default:
                sendto_realops_snomask(SNO_GENERAL, L_ALL, "chm_ban() called with unknown type!");
                return;
-               break;
        }
 
        if(dir == 0 || parc <= *parn)
@@ -1779,8 +1778,8 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
                                *mbuf = '\0';
 
                                if(cur_len > mlen)
-                                       sendto_channel_local(flags, chptr, "%s %s", modebuf,
-                                                            parabuf);
+                                       sendto_channel_local(IsServer(source_p) ? fakesource_p : source_p,
+                                                       flags, chptr, "%s %s", modebuf, parabuf);
                                else
                                        continue;
 
@@ -1816,7 +1815,8 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
 
                *mbuf = '\0';
                if(cur_len > mlen)
-                       sendto_channel_local(flags, chptr, "%s %s", modebuf, parabuf);
+                       sendto_channel_local(IsServer(source_p) ? fakesource_p : source_p,
+                               flags, chptr, "%s %s", modebuf, parabuf);
        }
 
        /* only propagate modes originating locally, or if we're hubbing */