X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/4355dbd3c9e2325c97dd464c78360edf4a957ade..fdbbf311ef10d7458bb3c313be02000a75f0972a:/src/s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index 441012c..c64d50f 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -73,7 +73,7 @@ int user_modes[256] = {
 	UMODE_DEAF,		/* D */
 	0,			/* E */
 	0,			/* F */
-	0,			/* G */
+	UMODE_SCALLERID,	/* G */
 	0,			/* H */
 	0,			/* I */
 	0,			/* J */
@@ -109,7 +109,7 @@ int user_modes[256] = {
 	0,			/* m */
 	0,			/* n */
 	UMODE_OPER,		/* o */
-	0,			/* p */
+	UMODE_OVERRIDE,		/* p */
 	0,			/* q */
 	0,			/* r */
 	UMODE_SERVNOTICE,	/* s */
@@ -1138,6 +1138,12 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
 		source_p->umodes &= ~UMODE_ADMIN;
 	}
 
+	if(MyConnect(source_p) && (source_p->umodes & UMODE_OVERRIDE) && (!IsOperOverride(source_p)))
+	{
+		sendto_one_notice(source_p, ":*** You need oper and the override flag for +p");
+		source_p->umodes &= ~UMODE_OVERRIDE;
+	}
+
 	/* let modules providing usermodes know that we've changed our usermode --nenolod */
 	hdata.client = source_p;
 	hdata.oldumodes = setflags;
@@ -1464,6 +1470,13 @@ change_nick_user_host(struct Client *target_p,	const char *nick, const char *use
 			chptr = mscptr->chptr;
 			mptr = mode;
 
+			if(is_owner(mscptr))
+			{
+				*mptr++ = 'a';
+				strcat(modeval, nick);
+				strcat(modeval, " ");
+			}
+
 			if(is_chanop(mscptr))
 			{
 				*mptr++ = 'o';
@@ -1471,6 +1484,13 @@ change_nick_user_host(struct Client *target_p,	const char *nick, const char *use
 				strcat(modeval, " ");
 			}
 
+			if(is_halfop(mscptr))
+			{
+				*mptr++ = 'h';
+				strcat(modeval, nick);
+				strcat(modeval, " ");
+			}
+
 			if(is_voiced(mscptr))
 			{
 				*mptr++ = 'v';