Remove FLAGS2_NOLIMIT (IsExemptLimits/SetExemptLimits).
This only has an effect at connection time, and the ConfItem flag suffices for that.
This commit is contained in:
parent
e4b9c8e115
commit
5ca543e7c5
4 changed files with 1 additions and 7 deletions
|
@ -91,7 +91,6 @@ static struct mode_table auth_client_table[] = {
|
||||||
{"gline_exempt", FLAGS2_EXEMPTGLINE },
|
{"gline_exempt", FLAGS2_EXEMPTGLINE },
|
||||||
{"kline_exempt", FLAGS2_EXEMPTKLINE },
|
{"kline_exempt", FLAGS2_EXEMPTKLINE },
|
||||||
{"flood_exempt", FLAGS2_EXEMPTFLOOD },
|
{"flood_exempt", FLAGS2_EXEMPTFLOOD },
|
||||||
/*{"exceed_limit", FLAGS2_NOLIMIT }, no effect (?) */
|
|
||||||
{"spambot_exempt", FLAGS2_EXEMPTSPAMBOT },
|
{"spambot_exempt", FLAGS2_EXEMPTSPAMBOT },
|
||||||
{"shide_exempt", FLAGS2_EXEMPTSHIDE },
|
{"shide_exempt", FLAGS2_EXEMPTSHIDE },
|
||||||
{"jupe_exempt", FLAGS2_EXEMPTJUPE },
|
{"jupe_exempt", FLAGS2_EXEMPTJUPE },
|
||||||
|
|
|
@ -458,7 +458,6 @@ struct exit_client_hook
|
||||||
#define FLAGS2_EXEMPTGLINE 0x00800000
|
#define FLAGS2_EXEMPTGLINE 0x00800000
|
||||||
#define FLAGS2_EXEMPTKLINE 0x01000000
|
#define FLAGS2_EXEMPTKLINE 0x01000000
|
||||||
#define FLAGS2_EXEMPTFLOOD 0x02000000
|
#define FLAGS2_EXEMPTFLOOD 0x02000000
|
||||||
#define FLAGS2_NOLIMIT 0x04000000
|
|
||||||
#define FLAGS2_IP_SPOOFING 0x10000000
|
#define FLAGS2_IP_SPOOFING 0x10000000
|
||||||
#define FLAGS2_EXEMPTSPAMBOT 0x20000000
|
#define FLAGS2_EXEMPTSPAMBOT 0x20000000
|
||||||
#define FLAGS2_EXEMPTSHIDE 0x40000000
|
#define FLAGS2_EXEMPTSHIDE 0x40000000
|
||||||
|
@ -539,8 +538,6 @@ struct exit_client_hook
|
||||||
*/
|
*/
|
||||||
#define IsExemptKline(x) ((x)->flags2 & FLAGS2_EXEMPTKLINE)
|
#define IsExemptKline(x) ((x)->flags2 & FLAGS2_EXEMPTKLINE)
|
||||||
#define SetExemptKline(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 IsExemptGline(x) ((x)->flags2 & FLAGS2_EXEMPTGLINE)
|
||||||
#define SetExemptGline(x) ((x)->flags2 |= FLAGS2_EXEMPTGLINE)
|
#define SetExemptGline(x) ((x)->flags2 |= FLAGS2_EXEMPTGLINE)
|
||||||
#define IsExemptFlood(x) ((x)->flags2 & FLAGS2_EXEMPTFLOOD)
|
#define IsExemptFlood(x) ((x)->flags2 & FLAGS2_EXEMPTFLOOD)
|
||||||
|
|
|
@ -599,7 +599,6 @@ attach_conf(struct Client *client_p, struct ConfItem *aconf)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
sendto_one_notice(client_p, ":*** I: line is full, but you have an >I: line!");
|
sendto_one_notice(client_p, ":*** I: line is full, but you have an >I: line!");
|
||||||
SetExemptLimits(client_p);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -398,7 +398,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
|
||||||
*/
|
*/
|
||||||
/* Except "F:" clients */
|
/* Except "F:" clients */
|
||||||
if(dlink_list_length(&lclient_list) >=
|
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,
|
sendto_realops_snomask(SNO_FULL, L_ALL,
|
||||||
"Too many clients, rejecting %s[%s].", source_p->name, source_p->host);
|
"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 this user is exempt from user limits set it F lined" */
|
||||||
if(IsConfExemptLimits(aconf))
|
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.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue