[svn] - we do not need to call find_server() in the function for registering local...

diff --git a/ChangeLog b/ChangeLog
index 3de204efe401128d63fb0a22bc3c9e3be99af37e..5d42764042049131c05daf7f0bd2a43ef83ed2f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+nenolod     2007/11/20 11:08:23 UTC    (20071120-3584)
+  Log:
+  Explain invalid username rejections to users when they are rejected.
+  
+
+  Changes:     Modified:
+  +2 -0                trunk/src/s_user.c (File Modified) 
+
+
 jilles      2007/11/17 21:55:48 UTC    (20071117-3582)
   Log:
   Update description of oper privileges a bit.

diff --git a/include/serno.h b/include/serno.h
index bfe531f8f10a88cbd2fbe39d36a417198288da58..fa44d69a0841562a17f2af61d9ac077af0fb7bdf 100644 (file)
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20071117-3582"
+#define SERNO "20071120-3584"

diff --git a/src/s_user.c b/src/s_user.c
index ce4e3eca36b6d29fc95d527352e90ae7c69d5320..07941dcdd5df691f5b88ee8e869fb216f58870e8 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 3584 2007-11-20 11:08:23Z nenolod $
+ *  $Id: s_user.c 3586 2007-11-20 11:16:43Z nenolod $
  */
 
 #include "stdinc.h"
@@ -534,12 +534,13 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
        dlinkMoveNode(&source_p->localClient->tnode, &unknown_list, &lclient_list);
        SetClient(source_p);
 
-       /* XXX source_p->servptr is &me, since local client */
-       source_p->servptr = find_server(NULL, user->server);
+       source_p->servptr = &me;
        dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
+
        /* Increment our total user count here */
        if(++Count.total > Count.max_tot)
                Count.max_tot = Count.total;
+
        source_p->localClient->allow_read = MAX_FLOOD_BURST;
 
        Count.totalrestartcount++;