Commits

Anonymous committed 2a8320f

[svn] Move username check after xline and dnsbl checks, so it
will not complain to opers about clients who are xlined
or blacklisted anyway (both of which silently reject).

Comments (0)

Files changed (3)

+nenolod     2007/03/05 19:01:05 UTC	(20070305-3253)
+  Log:
+  - MASTER_MAX is no longer relevant
+  
+
+  Changes:	Modified:
+  +0 -7		trunk/modules/m_set.c (File Modified) 
+
+
 nenolod     2007/03/05 18:58:38 UTC	(20070305-3251)
   Log:
   - add config option for setting max_clients.
-#define SERNO "20070305-3251"
+#define SERNO "20070305-3253"
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_user.c 3227 2007-03-05 01:14:46Z jilles $
+ *  $Id: s_user.c 3255 2007-03-06 14:07:11Z jilles $
  */
 
 #include "stdinc.h"
 		return (CLIENT_EXITED);
 	}
 
-	/* valid user name check */
-
-	if(!valid_username(source_p->username))
-	{
-		sendto_realops_snomask(SNO_REJ, L_ALL,
-				     "Invalid username: %s (%s@%s)",
-				     source_p->name, source_p->username, source_p->host);
-		ServerStats->is_ref++;
-		ircsprintf(tmpstr2, "Invalid username [%s]", source_p->username);
-		exit_client(client_p, source_p, &me, tmpstr2);
-		return (CLIENT_EXITED);
-	}
-
-	/* end of valid user name check */
-
 	/* kline exemption extends to xline too */
 	if(!IsExemptKline(source_p) &&
 	   find_xline(source_p->info, 1) != NULL)
 		}
 	}
 
+	/* valid user name check */
+
+	if(!valid_username(source_p->username))
+	{
+		sendto_realops_snomask(SNO_REJ, L_ALL,
+				     "Invalid username: %s (%s@%s)",
+				     source_p->name, source_p->username, source_p->host);
+		ServerStats->is_ref++;
+		ircsprintf(tmpstr2, "Invalid username [%s]", source_p->username);
+		exit_client(client_p, source_p, &me, tmpstr2);
+		return (CLIENT_EXITED);
+	}
+
+	/* end of valid user name check */
+
 	/* Store original hostname -- jilles */
 	strlcpy(source_p->orighost, source_p->host, HOSTLEN + 1);