Make number_per_ident actually apply to unidented connections as well,

as documented in reference.conf.

Noticed by: spb

diff --git a/src/s_conf.c b/src/s_conf.c
index d8808c70a953252cf1bd3f189e84994731f37de2..48192c9e7adae329966ff8f8dfb889d086f646c4 100644 (file)
--- 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))