Commits

Jilles Tjoelker  committed 9f3d23a

Make number_per_ident actually apply to unidented connections as well,
as documented in reference.conf.

Noticed by: spb

  • Participants
  • Parent commits 1d059a7

Comments (0)

Files changed (1)

File src/s_conf.c

 	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))