X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fctdlproto%2Fserv_session.c;h=fa8186635381a62e51bccfd064165f57d6c4ee66;hp=eacaa9da696db2ea5c5c02269992b35b99155005;hb=50ff39d933b7178377b3a67f8edc31ffa42ffd28;hpb=0e19dfa22f8f12f33b095abd24b10d7d39c74c60

diff --git a/citadel/modules/ctdlproto/serv_session.c b/citadel/modules/ctdlproto/serv_session.c
index eacaa9da6..fa8186635 100644
--- a/citadel/modules/ctdlproto/serv_session.c
+++ b/citadel/modules/ctdlproto/serv_session.c
@@ -1,7 +1,7 @@
 /* 
  * Server functions which perform operations on user objects.
  *
- * Copyright (c) 1987-2017 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.
@@ -125,7 +125,6 @@ void cmd_more(char *argbuf) {
  */
 void cmd_iden(char *argbuf)
 {
-        CitContext *CCC = MyContext();
 	int dev_code;
 	int cli_code;
 	int rev_level;
@@ -146,17 +145,17 @@ void cmd_iden(char *argbuf)
 	from_host[sizeof from_host - 1] = 0;
 	if (num_parms(argbuf)>=5) extract_token(from_host, argbuf, 4, '|', sizeof from_host);
 
-	CCC->cs_clientdev = dev_code;
-	CCC->cs_clienttyp = cli_code;
-	CCC->cs_clientver = rev_level;
-	safestrncpy(CCC->cs_clientname, desc, sizeof CCC->cs_clientname);
-	CCC->cs_clientname[31] = 0;
-
-	/* For local sockets and public clients, trust the hostname supplied by the client */
-	if ( (CCC->is_local_socket) || (CtdlIsPublicClient()) ) {
-		safestrncpy(CCC->cs_host, from_host, sizeof CCC->cs_host);
-		CCC->cs_host[sizeof CCC->cs_host - 1] = 0;
-		CCC->cs_addr[0] = 0;
+	CC->cs_clientdev = dev_code;
+	CC->cs_clienttyp = cli_code;
+	CC->cs_clientver = rev_level;
+	safestrncpy(CC->cs_clientname, desc, sizeof CC->cs_clientname);
+	CC->cs_clientname[31] = 0;
+
+	/* For local sockets, allow the client to supply the user's origin address */
+	if (CC->is_local_socket) {
+		safestrncpy(CC->cs_host, from_host, sizeof CC->cs_host);
+		CC->cs_host[sizeof CC->cs_host - 1] = 0;
+		CC->cs_addr[0] = 0;
 	}
 
 	syslog(LOG_NOTICE, "session: client %d/%d/%01d.%02d (%s) from %s",
@@ -165,7 +164,7 @@ void cmd_iden(char *argbuf)
 		(rev_level / 100),
 		(rev_level % 100),
 		desc,
-		CCC->cs_host
+		CC->cs_host
 	);
 	cprintf("%d Ok\n",CIT_OK);
 }