more work on removing masqueraded user/room/host names

[citadel.git] / citadel / context.c

diff --git a/citadel/context.c b/citadel/context.c
index 47da2679f5fec868fe972e7f1937e1b9b4954c68..6593870a4f9038ffa361d5ed7fc1d5cea3982f58 100644 (file)
--- a/citadel/context.c
+++ b/citadel/context.c
@@ -2,7 +2,7 @@
  * Citadel context management stuff.
  * Here's where we (hopefully) have all the code that manipulates contexts.
  *
- * Copyright (c) 1987-2018 by the citadel.org team
+ * Copyright (c) 1987-2019 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 3.
@@ -15,7 +15,6 @@
 
 #include "ctdl_module.h"
 #include "serv_extensions.h"
-#include "ecrash.h"
 #include "citserver.h"
 #include "user_ops.h"
 #include "locate_host.h"
@@ -72,9 +71,9 @@ int CtdlIsSingleUser(void)
        {
                /* check for only one context here */
                if (num_sessions == 1)
-                       return TRUE;
+                       return 1;
        }
-       return FALSE;
+       return 0;
 }
 
 
@@ -293,7 +292,6 @@ void RemoveContext (CitContext *con)
                c = "WTF?";
        }
        syslog(LOG_DEBUG, "context: RemoveContext(%s) session %d", c, con->cs_pid);
-///    cit_backtrace();
 
        /* Run any cleanup routines registered by loadable modules.
         * Note: We have to "become_session()" because the cleanup functions
@@ -492,9 +490,6 @@ void begin_session(CitContext *con)
        strcpy(con->lastcmdname, "    ");
        strcpy(con->cs_clientname, "(unknown)");
        strcpy(con->curr_user, NLI);
-       *con->fake_username = '\0';
-       *con->fake_hostname = '\0';
-       *con->fake_roomname = '\0';
        *con->cs_clientinfo = '\0';
        safestrncpy(con->cs_host, CtdlGetConfigStr("c_fqdn"), sizeof con->cs_host);
        safestrncpy(con->cs_addr, "", sizeof con->cs_addr);
@@ -544,7 +539,6 @@ void begin_session(CitContext *con)
 #endif
        }
        con->cs_flags = 0;
-       con->upload_type = UPL_FILE;
 
        con->nologin = 0;
        if (((CtdlGetConfigInt("c_maxsessions") > 0)&&(num_sessions > CtdlGetConfigInt("c_maxsessions"))) || CtdlWantSingleUser()) {