Yay for documenting code....

[irc/rqf/shadowircd.git] / src / channel.c

diff --git a/src/channel.c b/src/channel.c
index 02d5c3d52d88837fe032a64147f170e2959fb1e0..52f5b2b64c53ecdfe611f70a4ad72ec48322c942 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -968,9 +968,6 @@ can_send(struct Channel *chptr, struct Client *source_p, struct membership *mspt
        if(is_chanop_voiced(msptr))
                return CAN_SEND_OPV;
 
-       if(IsOverride(source_p))
-               return CAN_SEND_NONOP;
-
        if(chptr->mode.mode & MODE_MODERATED)
                return CAN_SEND_NO;
 
@@ -1818,7 +1815,7 @@ void user_join(struct Client * client_p, struct Client * source_p, const char *
                                        get_oper_name(source_p), chptr->chname);
                                sendto_server(NULL, chptr, NOCAPS, NOCAPS,
                                                ":%s WALLOPS :%s is overriding JOIN to [%s]",
-                                               use_id(source_p), get_oper_name(source_p), chptr->chname);
+                                               me.name, get_oper_name(source_p), chptr->chname);
                        }
                        else if ((i != ERR_NEEDREGGEDNICK && i != ERR_THROTTLE && i != ERR_INVITEONLYCHAN && i != ERR_CHANNELISFULL) ||
                            (!ConfigChannel.use_forward || (chptr = check_forward(source_p, chptr, key)) == NULL))