[svn] Don't show the UID if a TS6 server sends a kick with

[irc/rqf/shadowircd.git] / src / s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index 8589c40b7348a7dbbb30389c101bf7956d6a2264..f4ff4b06bd50ff1eb9f5de4ebf1c5878790a34d5 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 3293 2007-03-28 14:33:50Z 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)
@@ -448,7 +433,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                                        source_p->sockhost, source_p->preClient->dnsbl_listed->host);
                else
                {
-                       dlink_list varlist;
+                       dlink_list varlist = { NULL, NULL, 0 };
 
                        substitution_append_var(&varlist, "nick", source_p->name);
                        substitution_append_var(&varlist, "ip", source_p->sockhost);
@@ -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);