removed CtdlClearSystemContext() entirely.

[citadel.git] / citadel / context.c

diff --git a/citadel/context.c b/citadel/context.c
index c6575d3dba1e0194be7b21e6045a355be98823fc..f4bf0cef404c17d28b642a578507e122cfb361ec 100644 (file)
--- a/citadel/context.c
+++ b/citadel/context.c
@@ -352,13 +352,11 @@ void RemoveContext (CitContext *con)
        become_session(con);
        CtdlUserLogout();
        PerformSessionHooks(EVT_STOP);
+       client_close();                         /* If the client is still connected, blow 'em away. */
        become_session(NULL);
 
        syslog(LOG_NOTICE, "[%3d] Session ended.\n", con->cs_pid);
 
-       /* If the client is still connected, blow 'em away. */
-       client_close();
-
        /* If using AUTHMODE_LDAP, free the DN */
        if (con->ldap_dn) {
                free(con->ldap_dn);
@@ -549,16 +547,6 @@ void CtdlFillSystemContext(CitContext *context, char *name)
        }
 }
 
-/*
- * flush it again...
- */
-void CtdlClearSystemContext(void)
-{
-       CitContext *CCC = MyContext();
-
-       memset(CCC, 0, sizeof(CitContext));
-       pthread_setspecific(MyConKey, NULL);
-}
 
 /*
  * Cleanup any contexts that are left lying around