Merge.

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

diff --git a/src/client.c b/src/client.c
index 72ce398b5162ab58a36a4d64ffac188af31acbe1..b3f33c3fc27b60158870bdd6acc89b12a83ec95e 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);
@@ -255,6 +256,7 @@ free_client(struct Client *client_p)
        s_assert(&me != client_p);
        free_local_client(client_p);
        free_pre_client(client_p);
+       rb_free(client_p->certfp);
        rb_bh_free(client_heap, client_p);
 }
 
@@ -1670,14 +1672,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;