X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcontext.c;h=8b06ab5c811b1d352edd8c30673a2c6fdff45321;hb=bdfa2e9b6af7e32b11461433a28dd6551f830888;hp=6593870a4f9038ffa361d5ed7fc1d5cea3982f58;hpb=58c77aea1dda7b206b900bafb9278237456ef737;p=citadel.git

diff --git a/citadel/context.c b/citadel/context.c
index 6593870a4..8b06ab5c8 100644
--- a/citadel/context.c
+++ b/citadel/context.c
@@ -495,7 +495,7 @@ void begin_session(CitContext *con)
 	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
@@ -545,12 +545,9 @@ void begin_session(CitContext *con)
 		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);
@@ -571,7 +568,7 @@ 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;