X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/ff12cc94790de2e87e78ee7aa378f21fa415d73c..a4721f5e9fd9dedc68534e736075a755645621f2:/ircd/s_user.c

diff --git a/ircd/s_user.c b/ircd/s_user.c
index 77577bf1..55a0bb55 100644
--- a/ircd/s_user.c
+++ b/ircd/s_user.c
@@ -868,6 +868,12 @@ report_and_set_user_flags(struct Client *source_p, struct ConfItem *aconf)
 		SetExemptShide(source_p);
 		sendto_one_notice(source_p, ":*** You are exempt from serverhiding");
 	}
+
+	if(IsConfExtendChans(aconf))
+	{
+		SetExtendChans(source_p);
+		sendto_one_notice(source_p, ":*** You are exempt from normal channel limits");
+	}
 }
 
 static void
@@ -1309,6 +1315,7 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p)
 
 	Count.oper++;
 
+	SetExtendChans(source_p);
 	SetExemptKline(source_p);
 
 	source_p->flags2 |= oper_p->flags;
@@ -1500,7 +1507,9 @@ change_nick_user_host(struct Client *target_p,	const char *nick, const char *use
 					target_p->username, target_p->host);
 	}
 
-	rb_strlcpy(target_p->username, user, sizeof target_p->username);
+	if (user != target_p->username)
+		rb_strlcpy(target_p->username, user, sizeof target_p->username);
+
 	rb_strlcpy(target_p->host, host, sizeof target_p->host);
 
 	if (changed)