* Added a bit of detail to syslog entries; now shows session id attached to

  client, hostname, and username, and time the session ended.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index f1d11c7645674c046b2813855d9837f5ae082e03..bcf7b37d4a9329febb71fabfd655212838f3078b 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 573.29  2000/11/25 09:36:18  error
+ * Added a bit of detail to syslog entries; now shows session id attached to
+   client, hostname, and username, and time the session ended.
+
  Revision 573.28  2000/11/25 06:17:06  ajc
  * Minor IMAP tweaks.  It still doesn't work.  :(
 
@@ -2144,3 +2148,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import 
+

diff --git a/citadel/citserver.c b/citadel/citserver.c
index d249e345c7ae227e764e9ab9ce14de83cdb9b156..03ce8595f754012a67e63b2de7c2d4ad75713817 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -192,7 +192,7 @@ void RemoveContext (struct CitContext *con)
        lprintf(3, "citserver[%3d]: ended.\n", con->cs_pid);
        
 
-       syslog(LOG_NOTICE,"session %d ended", con->cs_pid);
+       syslog(LOG_NOTICE,"session %d: ended", con->cs_pid);
        
        /* Deallocate any user-data attached to this session */
        deallocate_user_data(con);
@@ -460,12 +460,14 @@ void cmd_iden(char *argbuf)
                (rev_level % 100),
                desc);
 
-       syslog(LOG_NOTICE,"client %d/%d/%01d.%02d (%s)\n",
+       syslog(LOG_NOTICE,"session %d: client %d/%d/%01d.%02d (%s) from %s\n",
+               CC->cs_pid,
                dev_code,
                cli_code,
                (rev_level / 100),
                (rev_level % 100),
-               desc);
+               desc,
+               CC->cs_host);
        cprintf("%d Ok\n",OK);
 }
 

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index e6e2e0b331200862a284e025f85ba76fc0c7165e..6dc5ff8a2c98dc0b88761ceb2250ecc3953149bb 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -363,7 +363,8 @@ void cmd_user(char *cmdbuf)
  */
 void session_startup(void)
 {
-       syslog(LOG_NOTICE, "user <%s> logged in", CC->curr_user);
+       syslog(LOG_NOTICE, "session %d: user <%s> logged in",
+              CC->cs_pid, CC->curr_user);
 
        lgetuser(&CC->usersupp, CC->curr_user);
        ++(CC->usersupp.timescalled);