No need to be paranoid about clearing auth_user.

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

diff --git a/src/client.c b/src/client.c
index b372e881ca35543abe2950e058bb5c73116ccfde..428b799c4fc679a358bb2b302acf0f4e04d07976 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -231,6 +231,7 @@ free_local_client(struct Client *client_p)
                rb_free(client_p->localClient->passwd);
        }
 
+       rb_free(client_p->localClient->auth_user);
        rb_free(client_p->localClient->challenge);
        rb_free(client_p->localClient->fullcaps);
        rb_free(client_p->localClient->opername);
@@ -585,7 +586,7 @@ check_xlines(void)
                                sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                                     "XLINE over-ruled for %s, client is kline_exempt [%s]",
                                                     get_client_name(client_p, HIDE_IP),
-                                                    aconf->name);
+                                                    aconf->host);
                                continue;
                        }
 
@@ -1105,7 +1106,7 @@ exit_aborted_clients(void *unused)
  *
  */
 void
-dead_link(struct Client *client_p)
+dead_link(struct Client *client_p, int sendqex)
 {
        struct abort_client *abt;
 
@@ -1115,7 +1116,7 @@ dead_link(struct Client *client_p)
 
        abt = (struct abort_client *) rb_malloc(sizeof(struct abort_client));
 
-       if(client_p->flags & FLAGS_SENDQEX)
+       if(sendqex)
                rb_strlcpy(abt->notice, "Max SendQ exceeded", sizeof(abt->notice));
        else
                rb_snprintf(abt->notice, sizeof(abt->notice), "Write error: %s", strerror(errno));
@@ -1657,10 +1658,8 @@ make_user(struct Client *client_p)
        {
                user = (struct User *) rb_bh_alloc(user_heap);
                user->refcnt = 1;
-               user->metadata = irc_dictionary_create(irccmp);
                client_p->user = user;
        }
-
        return user;
 }
 
@@ -1672,14 +1671,14 @@ make_user(struct Client *client_p)
  * side effects - add's an Server information block to a client
  *                if it was not previously allocated.
  */
-server_t *
+struct Server *
 make_server(struct Client *client_p)
 {
-       server_t *serv = client_p->serv;
+       struct Server *serv = client_p->serv;
 
        if(!serv)
        {
-               serv = (server_t *) rb_malloc(sizeof(server_t));
+               serv = (struct Server *) rb_malloc(sizeof(struct Server));
                client_p->serv = serv;
        }
        return client_p->serv;