Fix some split servers not appearing in oper /map.

[irc/rqf/shadowircd.git] / src / s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index a163a1a53d92e0ef3c8faffb54b853af40e505a2..3ef38c8e45faba603d4ed0436ef873da209a7fcd 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -398,7 +398,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
         */
        /* Except "F:" clients */
        if(dlink_list_length(&lclient_list) >=
-           (unsigned long)GlobalSetOptions.maxclients && !IsExemptLimits(source_p))
+           (unsigned long)GlobalSetOptions.maxclients && !IsConfExemptLimits(aconf))
        {
                sendto_realops_snomask(SNO_FULL, L_ALL,
                                     "Too many clients, rejecting %s[%s].", source_p->name, source_p->host);
@@ -811,7 +811,7 @@ report_and_set_user_flags(struct Client *source_p, struct ConfItem *aconf)
        if(IsConfExemptKline(aconf))
        {
                SetExemptKline(source_p);
-               sendto_one_notice(source_p, ":*** You are exempt from K/D/G/X lines. congrats.");
+               sendto_one_notice(source_p, ":*** You are exempt from K/G/X lines. congrats.");
        }
 
        if(IsConfExemptGline(aconf))
@@ -831,15 +831,7 @@ report_and_set_user_flags(struct Client *source_p, struct ConfItem *aconf)
        /* If this user is exempt from user limits set it F lined" */
        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 +1076,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 +1089,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;
        }