Automated merge with ssh://shadowircd/uranium/shadowircd/

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

diff --git a/src/client.c b/src/client.c
index 93b04e71793f83b0921de4efdb8febbee466cfc4..cad1b7f5a4b51f2dee94e36026a771b35f1a3943 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -224,13 +224,6 @@ free_local_client(struct Client *client_p)
                rb_close(client_p->localClient->F);
        }
 
-       if (client_p->localClient->auth_user)
-       {
-               memset(client_p->localClient->auth_user, 0,
-                       strlen(client_p->localClient->auth_user));
-               rb_free(client_p->localClient->auth_user);
-       }
-
        if(client_p->localClient->passwd)
        {
                memset(client_p->localClient->passwd, 0,
@@ -238,6 +231,13 @@ free_local_client(struct Client *client_p)
                rb_free(client_p->localClient->passwd);
        }
 
+       rb_free(client_p->localClient->auth_user);
+
+       if(client_p->localClient->override_timeout_event)
+       {
+               rb_event_delete(client_p->localClient->override_timeout_event);
+       }
+
        rb_free(client_p->localClient->challenge);
        rb_free(client_p->localClient->fullcaps);
        rb_free(client_p->localClient->opername);
@@ -262,6 +262,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);
 }