X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/1332a0ef97f5b6b224873ab77ec2cebb524db494..d25c6eb1b223d1a0993dde9a28c97ef95e54bceb:/src/s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index 2d5f62e..c315565 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -988,18 +988,6 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
 			sendto_one_numeric(source_p, RPL_SNOMASK, form_str(RPL_SNOMASK),
 				construct_snobuf(source_p->snomask));
 
-		/* If we're setting +p, expire it, but only from local clients */
-		if(ConfigFileEntry.expire_override_time && MyClient(source_p) && (source_p->umodes & ~setflags) & UMODE_OVERRIDE)
-		{
-			source_p->localClient->override_timeout_event =
-				rb_event_addonce("expire_override", expire_umode_p, source_p, ConfigFileEntry.expire_override_time);
-		}
-		else if(MyClient(source_p) && source_p->localClient->override_timeout_event && (setflags & ~source_p->umodes) & UMODE_OVERRIDE)
-		{
-			rb_event_delete(source_p->localClient->override_timeout_event);
-			source_p->localClient->override_timeout_event = NULL;
-		}
-
 		return 0;
 	}
 
@@ -1043,6 +1031,9 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
 
 				Count.oper--;
 
+				user_metadata_delete(source_p, "OPERSTRING", 1);
+				user_metadata_delete(source_p, "SWHOIS", 1);
+
 				if(MyConnect(source_p))
 				{
 					source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
@@ -1184,6 +1175,19 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
 		sendto_one_numeric(source_p, RPL_SNOMASK, form_str(RPL_SNOMASK),
 			construct_snobuf(source_p->snomask));
 
+		/* If we're setting +p, expire it, but only from local clients */
+		if(ConfigFileEntry.expire_override_time && MyClient(source_p) && (source_p->umodes & ~setflags) & UMODE_OVERRIDE)
+		{
+			source_p->localClient->override_timeout_event =
+				rb_event_addonce("expire_override", expire_umode_p, source_p, ConfigFileEntry.expire_override_time);
+		}
+		else if(MyClient(source_p) && source_p->localClient->override_timeout_event && (setflags & ~source_p->umodes) & UMODE_OVERRIDE)
+		{
+			rb_event_delete(source_p->localClient->override_timeout_event);
+			source_p->localClient->override_timeout_event = NULL;
+		}
+
+
 	return (0);
 }
 
@@ -1331,6 +1335,12 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p)
 	else
 		source_p->umodes |= DEFAULT_OPER_UMODES;
 
+	if(oper_p->swhois)
+		user_metadata_add(source_p, "SWHOIS", oper_p->swhois, 1);
+
+	if(oper_p->operstring)
+		user_metadata_add(source_p, "OPERSTRING", oper_p->operstring, 1);
+
 	if(oper_p->vhost || !EmptyString(ConfigFileEntry.default_operhost))
 	{
 		if(oper_p->vhost)
@@ -1511,7 +1521,7 @@ change_nick_user_host(struct Client *target_p,	const char *nick, const char *use
 			chptr = mscptr->chptr;
 			mptr = mode;
 
-			if(is_owner(mscptr))
+			if(is_admin(mscptr))
 			{
 				*mptr++ = 'a';
 				strcat(modeval, nick);