Remove FLAGS2_NOLIMIT (IsExemptLimits/SetExemptLimits).

This only has an effect at connection time, and the
ConfItem flag suffices for that.

diff --git a/extensions/m_privs.c b/extensions/m_privs.c
index beb8b9eabd1a807ce746a0680d88b61e0ccf7430..2b1f1d536b6e4c830c2938a6e738698f81c4b44b 100644 (file)
--- a/extensions/m_privs.c
+++ b/extensions/m_privs.c
@@ -91,7 +91,6 @@ static struct mode_table auth_client_table[] = {
        {"gline_exempt",        FLAGS2_EXEMPTGLINE      },
        {"kline_exempt",        FLAGS2_EXEMPTKLINE      },
        {"flood_exempt",        FLAGS2_EXEMPTFLOOD      },
        {"gline_exempt",        FLAGS2_EXEMPTGLINE      },
        {"kline_exempt",        FLAGS2_EXEMPTKLINE      },
        {"flood_exempt",        FLAGS2_EXEMPTFLOOD      },

-       /*{"exceed_limit",      FLAGS2_NOLIMIT          }, no effect (?) */

        {"spambot_exempt",      FLAGS2_EXEMPTSPAMBOT    },
        {"shide_exempt",        FLAGS2_EXEMPTSHIDE      },
        {"jupe_exempt",         FLAGS2_EXEMPTJUPE       },
        {"spambot_exempt",      FLAGS2_EXEMPTSPAMBOT    },
        {"shide_exempt",        FLAGS2_EXEMPTSHIDE      },
        {"jupe_exempt",         FLAGS2_EXEMPTJUPE       },

diff --git a/include/client.h b/include/client.h
index 1b8899d09d6c42e19b30b715c8dd7eb8e33656b9..a2d2a14ce0c2fe9bd603f04116e0d1b14e3200ec 100644 (file)
--- a/include/client.h
+++ b/include/client.h
@@ -458,7 +458,6 @@ struct exit_client_hook
 #define FLAGS2_EXEMPTGLINE      0x00800000
 #define FLAGS2_EXEMPTKLINE      0x01000000
 #define FLAGS2_EXEMPTFLOOD      0x02000000
 #define FLAGS2_EXEMPTGLINE      0x00800000
 #define FLAGS2_EXEMPTKLINE      0x01000000
 #define FLAGS2_EXEMPTFLOOD      0x02000000

-#define FLAGS2_NOLIMIT          0x04000000

 #define FLAGS2_IP_SPOOFING      0x10000000
 #define FLAGS2_EXEMPTSPAMBOT   0x20000000
 #define FLAGS2_EXEMPTSHIDE     0x40000000
 #define FLAGS2_IP_SPOOFING      0x10000000
 #define FLAGS2_EXEMPTSPAMBOT   0x20000000
 #define FLAGS2_EXEMPTSHIDE     0x40000000


@@ -539,8 +538,6 @@ struct exit_client_hook
  */
 #define IsExemptKline(x)        ((x)->flags2 & FLAGS2_EXEMPTKLINE)
 #define SetExemptKline(x)       ((x)->flags2 |= FLAGS2_EXEMPTKLINE)
  */
 #define IsExemptKline(x)        ((x)->flags2 & FLAGS2_EXEMPTKLINE)
 #define SetExemptKline(x)       ((x)->flags2 |= FLAGS2_EXEMPTKLINE)

-#define IsExemptLimits(x)       ((x)->flags2 & FLAGS2_NOLIMIT)
-#define SetExemptLimits(x)      ((x)->flags2 |= FLAGS2_NOLIMIT)

 #define IsExemptGline(x)        ((x)->flags2 & FLAGS2_EXEMPTGLINE)
 #define SetExemptGline(x)       ((x)->flags2 |= FLAGS2_EXEMPTGLINE)
 #define IsExemptFlood(x)        ((x)->flags2 & FLAGS2_EXEMPTFLOOD)
 #define IsExemptGline(x)        ((x)->flags2 & FLAGS2_EXEMPTGLINE)
 #define SetExemptGline(x)       ((x)->flags2 |= FLAGS2_EXEMPTGLINE)
 #define IsExemptFlood(x)        ((x)->flags2 & FLAGS2_EXEMPTFLOOD)

diff --git a/src/s_conf.c b/src/s_conf.c
index c14e2f83b5278f3e04230bf8dc10e7070023f9a5..1d6abd031183685b3015a3544b6673a96ed00862 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -599,7 +599,6 @@ attach_conf(struct Client *client_p, struct ConfItem *aconf)
                else
                {
                        sendto_one_notice(client_p, ":*** I: line is full, but you have an >I: line!");
                else
                {
                        sendto_one_notice(client_p, ":*** I: line is full, but you have an >I: line!");

-                       SetExemptLimits(client_p);

                }
 
        }
                }
 
        }

diff --git a/src/s_user.c b/src/s_user.c
index 58b05681a686ee9c4a7775ceb5543998edfab0a5..abbd36f35ed0274f05a6818dfab255a50a87791a 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) >=
         */
        /* 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);
        {
                sendto_realops_snomask(SNO_FULL, L_ALL,
                                     "Too many clients, rejecting %s[%s].", source_p->name, source_p->host);


@@ -831,7 +831,6 @@ 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))
        {
        /* 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.");
        }
 
                sendto_one_notice(source_p, ":*** You are exempt from user limits. congrats.");
        }