Remove the unneeded username parameter to register_local_user().

[solanum.git] / src / s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index 0e3c41b5c6e109cc13d081e126a06576d6db7ebe..57b405306ce6753970c54c46fbbd47dd3b2dd232 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -219,7 +219,7 @@ show_lusers(struct Client *source_p)
 */
 
 int
-register_local_user(struct Client *client_p, struct Client *source_p, const char *username)
+register_local_user(struct Client *client_p, struct Client *source_p)
 {
        struct ConfItem *aconf, *xconf;
        struct User *user = source_p->user;
@@ -230,7 +230,6 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 
        s_assert(NULL != source_p);
        s_assert(MyConnect(source_p));
-       s_assert(source_p->username != username);
 
        if(source_p == NULL)
                return -1;
@@ -265,12 +264,12 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
        client_p->localClient->last = rb_current_time();
 
        /* XXX - fixme. we shouldnt have to build a users buffer twice.. */
-       if(!IsGotId(source_p) && (strchr(username, '[') != NULL))
+       if(!IsGotId(source_p) && (strchr(source_p->username, '[') != NULL))
        {
                const char *p;
                int i = 0;
 
-               p = username;
+               p = source_p->username;
 
                while(*p && i < USERLEN)
                {
@@ -280,10 +279,11 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                }
 
                myusername[i] = '\0';
-               username = myusername;
        }
+       else
+               strlcpy(myusername, source_p->username, sizeof myusername);
 
-       if((status = check_client(client_p, source_p, username)) < 0)
+       if((status = check_client(client_p, source_p, myusername)) < 0)
                return (CLIENT_EXITED);
 
        /* Apply nick override */
@@ -339,7 +339,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                /* dont replace username if its supposed to be spoofed --fl */
                if(!IsConfDoSpoofIp(aconf) || !strchr(aconf->info.name, '@'))
                {
-                       p = username;
+                       p = myusername;
 
                        if(!IsNoTilde(aconf))
                                source_p->username[i++] = '~';