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

diff --git a/ChangeLog b/ChangeLog
index 56395937ec57c03565037ed115c02b1914fb8287..582b0c834837b0702d18fe1b68381e68d40e8b91 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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.

diff --git a/include/serno.h b/include/serno.h
index 56f9b084be137d94ef4f9cb5d7e43da917f3eb44..573323a4697500c4b3a9a234e08aa3ade2363d39 100644 (file)
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070305-3251"
+#define SERNO "20070305-3253"

diff --git a/src/s_user.c b/src/s_user.c
index 8589c40b7348a7dbbb30389c101bf7956d6a2264..ed91bdf8e5d1ec6e5f1bb0e49de1d5c69bb0327b 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -21,7 +21,7 @@
  *  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"
@@ -415,21 +415,6 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                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)
@@ -473,6 +458,21 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                }
        }
 
+       /* 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);