Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / citadel / control.c

diff --git a/citadel/control.c b/citadel/control.c
index 1e469b489ef84178f4466574a9ad5d2b780e1d11..b81526cf1dc855078349afb8ed70a4803bb0388d 100644 (file)
--- a/citadel/control.c
+++ b/citadel/control.c
@@ -693,8 +693,9 @@ void cmd_conf(char *argbuf)
                }
                put_config();
                snprintf(buf, sizeof buf,
-                        "The global system configuration has been edited by %s.\n",
-                        CC->curr_user);
+                       "The global system configuration has been edited by %s.\n",
+                        (CC->logged_in ? CC->curr_user : "an administrator")
+               );
                CtdlAideMessage(buf,"Citadel Configuration Manager Message");
 
                if (!IsEmptyStr(config.c_logpages))