X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/420b2c9a104d9aa7c232345614b8103292600678..d1264ac89250eee9f887a2ffa77f7ef55c0bc25b:/src/s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index 161cacc..58b0568 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -250,14 +250,14 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 			source_p->flags |= FLAGS_PINGSENT;
 			return -1;
 		}
-		if(!(source_p->flags2 & FLAGS2_PING_COOKIE))
+		if(!(source_p->flags & FLAGS_PING_COOKIE))
 		{
 			return -1;
 		}
 	}
 
 	/* hasnt finished client cap negotiation */
-	if(source_p->flags2 & FLAGS2_CLICAP)
+	if(source_p->flags & FLAGS_CLICAP)
 		return -1;
 
 	/* still has DNSbls to validate against */
@@ -296,7 +296,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 		del_from_client_hash(source_p->name, source_p);
 		strlcpy(source_p->name, source_p->preClient->spoofnick, NICKLEN + 1);
 		add_to_client_hash(source_p->name, source_p);
-		comm_note(source_p->localClient->fd, "Nick: %s", source_p->name);
+		comm_note(source_p->localClient->F->fd, "Nick: %s", source_p->name);
 	}
 
 	if(!valid_hostname(source_p->host))
@@ -832,14 +832,7 @@ report_and_set_user_flags(struct Client *source_p, struct ConfItem *aconf)
 	if(IsConfExemptLimits(aconf))
 	{
 		SetExemptLimits(source_p);
-		sendto_one_notice(source_p, "*** You are exempt from user limits. congrats.");
-	}
-
-	/* If this user is exempt from idle time outs */
-	if(IsConfIdlelined(aconf))
-	{
-		SetIdlelined(source_p);
-		sendto_one_notice(source_p, ":*** You are exempt from idle limits. congrats.");
+		sendto_one_notice(source_p, ":*** You are exempt from user limits. congrats.");
 	}
 
 	if(IsConfExemptFlood(aconf))
@@ -1084,7 +1077,7 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
 
 	if(MyClient(source_p) && (source_p->snomask & SNO_NCHANGE) && !IsOperN(source_p))
 	{
-		sendto_one_notice(source_p, ":*** You need oper and N flag for +s +n");
+		sendto_one_notice(source_p, ":*** You need oper and nick_changes flag for +s +n");
 		source_p->snomask &= ~SNO_NCHANGE;	/* only tcm's really need this */
 	}
 
@@ -1097,7 +1090,7 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
 	if(MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
 	   (!IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p)))
 	{
-		sendto_one_notice(source_p, ":*** You need oper and A flag for +a");
+		sendto_one_notice(source_p, ":*** You need oper and admin flag for +a");
 		source_p->umodes &= ~UMODE_ADMIN;
 	}