Remove all the DEFINE's and the random places they were used for the .conf-based...

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

diff --git a/src/s_user.c b/src/s_user.c
index b0ed306187ce5a04382050796b90354ddd20ea74..b81fe83c65241f5b300e7dce68371c9b38b43e66 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -54,8 +54,6 @@
 #include "substitution.h"
 #include "chmode.h"
 
-struct module_modes ModuleModes;
-
 static void report_and_set_user_flags(struct Client *, struct ConfItem *);
 void user_welcome(struct Client *source_p);
 
@@ -455,8 +453,8 @@ 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] is being disconnected due to being listed in DNS Blacklist %s",
-                                       source_p->name, source_p->sockhost, source_p->preClient->dnsbl_listed->host);
+                                       "%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);
                        exit_client(client_p, source_p, &me, "*** Banned (DNS blacklist)");
@@ -915,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);
 }
@@ -1103,7 +1101,7 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
                        }
                        /* FALLTHROUGH */
                default:
-                       if (MyConnect(source_p) && *pm == 'Q' && !ModuleModes.MODE_FORWARD) {
+                       if (MyConnect(source_p) && *pm == 'Q' && !ConfigChannel.use_forward) {
                                badflag = YES;
                                break;
                        }
@@ -1295,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);