commit 90509b2e2a364471f2461367fd02c11c8ab3c72d

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

diff --git a/src/s_user.c b/src/s_user.c
index 7fbeaae1f0fc9549a71bdd439c92ca2107ad3d9f..04dcef716c0f4b1da87bb242698b47099660b14e 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -453,7 +453,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                        source_p->preClient->dnsbl_listed->hits++;
 
                        sendto_realops_snomask(SNO_REJ, L_ALL,
-                                       "%s [%s@%s] is being disconnected due to being listed in DNS Blacklist %s",
+                                       "%s (%s@%s) is being disconnected due to being listed in DNS Blacklist %s",
                                        source_p->name, source_p->username, source_p->sockhost, source_p->preClient->dnsbl_listed->host);
 
                        add_reject(source_p, NULL, NULL);
@@ -913,7 +913,7 @@ static void
 expire_umode_p(void *data)
 {
        struct Client *source_p = data;
-       char *parv[4] = {source_p->name, source_p->name, "-p", NULL};
+       const char *parv[4] = {source_p->name, source_p->name, "-p", NULL};
        source_p->localClient->override_timeout_event = NULL;
        user_mode(source_p, source_p, 3, parv);
 }
@@ -1293,7 +1293,7 @@ user_welcome(struct Client *source_p)
        sendto_one_numeric(source_p, RPL_YOURHOST, form_str(RPL_YOURHOST),
                   get_listener_name(source_p->localClient->listener), ircd_version);
        sendto_one_numeric(source_p, RPL_CREATED, form_str(RPL_CREATED), creation);
-       sendto_one_numeric(source_p, RPL_MYINFO, form_str(RPL_MYINFO), me.name, ircd_version, umodebuf, cflagsmyinfo);
+       sendto_one_numeric(source_p, RPL_MYINFO, form_str(RPL_MYINFO), me.name, ircd_version, umodebuf, cflagsmyinfo, cflagsparaminfo);
 
        show_isupport(source_p);
 
@@ -1396,6 +1396,8 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p)
                source_p->snomask &= ~SNO_NCHANGE;
        if(!IsOperOperwall(source_p))
                source_p->umodes &= ~UMODE_OPERWALL;
+       if (!IsOperOverride(source_p))
+               source_p->umodes &= ~UMODE_OVERRIDE;
        hdata.client = source_p;
        hdata.oldumodes = old;
        hdata.oldsnomask = oldsnomask;