X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcontext.c;h=8b06ab5c811b1d352edd8c30673a2c6fdff45321;hb=bdfa2e9b6af7e32b11461433a28dd6551f830888;hp=4e8594d785d4dbbcc83cfe66de4beeacfeab48bb;hpb=7e8e24791e16e0a94ed346c6a11595a40d3a31b1;p=citadel.git

diff --git a/citadel/context.c b/citadel/context.c
index 4e8594d78..8b06ab5c8 100644
--- 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-2015 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,8 +15,6 @@
 
 #include "ctdl_module.h"
 #include "serv_extensions.h"
-#include "ecrash.h"
-
 #include "citserver.h"
 #include "user_ops.h"
 #include "locate_host.h"
@@ -52,6 +50,7 @@ int CtdlTrySingleUser(void)
 	return can_do;
 }
 
+
 void CtdlEndSingleUser(void)
 {
 	begin_critical_section(S_SINGLE_USER);
@@ -65,21 +64,19 @@ int CtdlWantSingleUser(void)
 	return want_single_user;
 }
 
+
 int CtdlIsSingleUser(void)
 {
 	if (want_single_user)
 	{
 		/* check for only one context here */
 		if (num_sessions == 1)
-			return TRUE;
+			return 1;
 	}
-	return FALSE;
+	return 0;
 }
 
 
-
-
-
 /*
  * Locate a context by its session number and terminate it if the user is able.
  * User can NOT terminate their current session.
@@ -295,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
@@ -347,7 +343,7 @@ CitContext *CreateNewContext(void) {
 
 	me = (CitContext *) malloc(sizeof(CitContext));
 	if (me == NULL) {
-		syslog(LOG_ERR, "citserver: malloc() failed: %s", strerror(errno));
+		syslog(LOG_ERR, "citserver: malloc() failed: %m");
 		return NULL;
 	}
 	memset(me, 0, sizeof(CitContext));
@@ -396,7 +392,7 @@ CitContext *CloneContext(CitContext *CloneMe) {
 
 	me = (CitContext *) malloc(sizeof(CitContext));
 	if (me == NULL) {
-		syslog(LOG_ERR, "citserver: malloc() failed: %s", strerror(errno));
+		syslog(LOG_ERR, "citserver: malloc() failed: %m");
 		return NULL;
 	}
 	memcpy(me, CloneMe, sizeof(CitContext));
@@ -494,16 +490,12 @@ void begin_session(CitContext *con)
 	strcpy(con->lastcmdname, "    ");
 	strcpy(con->cs_clientname, "(unknown)");
 	strcpy(con->curr_user, NLI);
-	*con->net_node = '\0';
-	*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);
 	con->cs_UDSclientUID = -1;
 	con->cs_host[sizeof con->cs_host - 1] = 0;
-	if (!CC->is_local_socket) {
+	if (!CC->is_local_client) {
 		locate_host(con->cs_host, sizeof con->cs_host,
 			con->cs_addr, sizeof con->cs_addr,
 			con->client_socket
@@ -547,20 +539,15 @@ void begin_session(CitContext *con)
 #endif
 	}
 	con->cs_flags = 0;
-	con->upload_type = UPL_FILE;
-	con->dl_is_net = 0;
 
 	con->nologin = 0;
 	if (((CtdlGetConfigInt("c_maxsessions") > 0)&&(num_sessions > CtdlGetConfigInt("c_maxsessions"))) || CtdlWantSingleUser()) {
 		con->nologin = 1;
 	}
 
-	if (!CC->is_local_socket) {
-		syslog(LOG_INFO, "context: session (%s) started from %s (%s)", con->ServiceName, con->cs_host, con->cs_addr);
-	}
-	else {
-		syslog(LOG_INFO, "context: session (%s) started via local socket with uid=%d", con->ServiceName, con->cs_UDSclientUID);
-	}
+	syslog(LOG_INFO, "context: session (%s) started from %s (%s) uid=%d",
+		con->ServiceName, con->cs_host, con->cs_addr, con->cs_UDSclientUID
+	);
 
 	/* Run any session startup routines registered by loadable modules */
 	PerformSessionHooks(EVT_START);
@@ -581,16 +568,16 @@ void CtdlFillSystemContext(CitContext *context, char *name)
 	context->cs_pid = 0;
 	strcpy (sysname, "SYS_");
 	strcat (sysname, name);
-	len = cutuserkey(sysname);
+	len = cutusername(sysname);
 	memcpy(context->curr_user, sysname, len + 1);
 	context->client_socket = (-1);
 	context->state = CON_SYS;
 	context->ServiceName = name;
 
-	/* internal_create_user has the side effect of loading the user regardless of wether they
+	/* internal_create_user has the side effect of loading the user regardless of whether they
 	 * already existed or needed to be created
 	 */
-	internal_create_user (sysname, len, &(context->user), -1) ;
+	internal_create_user(sysname, &(context->user), -1) ;
 	
 	/* Check to see if the system user needs upgrading */
 	if (context->user.usernum == 0)