From 0857036424dd0a4eeff50ae1cb740c0cb2155ed8 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sun, 21 Nov 2010 19:55:40 +0100
Subject: [PATCH 1/1] Log remote-IP on login attempts

By Stuart Cianos
---
 citadel/citserver.c | 4 ++--
 citadel/citserver.h | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 859c25fa9..1df958512 100644
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -1032,10 +1032,10 @@ void do_command_loop(void) {
 
 	/* Log the server command, but don't show passwords... */
 	if ( (strncasecmp(cmdbuf, "PASS", 4)) && (strncasecmp(cmdbuf, "SETP", 4)) ) {
-		CtdlLogPrintf(CTDL_INFO, "%s\n", cmdbuf);
+		CtdlLogPrintf(CTDL_INFO, "CtdlCommand [%s] [%s] %s\n", CTDLUSERIP, CC->curr_user, cmdbuf);
 	}
 	else {
-		CtdlLogPrintf(CTDL_INFO, "<password command hidden from log>\n");
+		CtdlLogPrintf(CTDL_INFO, "CtdlCommand [%s] [%s] <password command hidden from log>\n", CTDLUSERIP, CC->curr_user);
 	}
 
 	buffer_output();
diff --git a/citadel/citserver.h b/citadel/citserver.h
index 02815f595..437f4b28a 100644
--- a/citadel/citserver.h
+++ b/citadel/citserver.h
@@ -29,6 +29,8 @@ struct UserProcList {
 	char user[64];
 };
 
+#define CTDLUSERIP      (IsEmptyStr(CC->cs_addr) ? "localsocket" : CC->cs_addr)
+
 void cit_backtrace(void);
 void cit_panic_backtrace(int SigNum);
 void master_startup (void);
-- 
2.39.2