From 15f92147c7e1c8d8412c65e810af584642325f21 Mon Sep 17 00:00:00 2001 From: Jilles Tjoelker Date: Wed, 9 Jun 2010 21:22:47 +0200 Subject: [PATCH] Make number_per_ident actually apply to unidented connections as well, as documented in reference.conf. Noticed by: spb --- src/s_conf.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/s_conf.c b/src/s_conf.c index d8808c70..48192c9e 100644 --- a/src/s_conf.c +++ b/src/s_conf.c @@ -483,14 +483,13 @@ attach_iline(struct Client *client_p, struct ConfItem *aconf) int local_count = 0; int global_count = 0; int ident_count = 0; - int unidented = 0; + int unidented; if(IsConfExemptLimits(aconf)) return (attach_conf(client_p, aconf)); - if(*client_p->username == '~') - unidented = 1; - + unidented = !IsGotId(client_p) && !IsNoTilde(aconf) && + (!IsConfDoSpoofIp(aconf) || !strchr(aconf->info.name, '@')); /* find_hostname() returns the head of the list to search */ RB_DLINK_FOREACH(ptr, find_hostname(client_p->host))