X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/dab6375a1ee20c724bf93dda872245567b11d733..bd73ea56ba81a3b26a5f6284814a7efb481f1a56:/src/s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index a6727ec..04dcef7 100644
--- 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);
 
@@ -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);
 
@@ -1398,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;