kaserver-log-tgtreq-20061206

[openafs.git] / src / kauth / kalog.c

diff --git a/src/kauth/kalog.c b/src/kauth/kalog.c
index 89d3ae8..85b6bea 100644 (file)
--- a/src/kauth/kalog.c
+++ b/src/kauth/kalog.c
@@ -16,17 +16,24 @@
  *
  */
 
-#include <afs/param.h>
 #include <afsconfig.h>
+#include <afs/param.h>
 
-RCSID("$Header$");
+RCSID
+    ("$Header$");
 
 #include <stdio.h>
 #include <afs/afsutil.h>
-#ifndef AFS_NT40_ENV
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
+#endif
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
 #include <sys/types.h>
 #include <time.h>
 #include <signal.h>
@@ -35,7 +42,7 @@ RCSID("$Header$");
 #include "kauth.h"
 #include "kalog.h"
 
-extern afs_int32 verbose_track; 
+extern afs_int32 verbose_track;
 
 #ifdef AUTH_DBM_LOG
 
@@ -43,25 +50,28 @@ DBM *kalog_db;
 
 kalog_Init()
 {
-    OpenLog(AFSDIR_SERVER_KALOGDB_FILEPATH);      /* set up logging */
+    OpenLog(AFSDIR_SERVER_KALOGDB_FILEPATH);   /* set up logging */
     SetupLogSignals();
-    kalog_db = dbm_open(AFSDIR_SERVER_KALOG_FILEPATH, O_WRONLY | O_CREAT, KALOG_DB_MODE);
+    kalog_db =
+       dbm_open(AFSDIR_SERVER_KALOG_FILEPATH, O_WRONLY | O_CREAT,
+                KALOG_DB_MODE);
     if (!kalog_db)
-        ViceLog(0, ("Cannot open dbm database - no DB logging possible\n"));
+       ViceLog(0, ("Cannot open dbm database - no DB logging possible\n"));
 }
 
 /* log a ticket usage */
-kalog_log(principal, instance, sprincipal, sinstance, realm, hostaddr, type)
-    char *principal, *instance, *sprincipal, *sinstance, *realm;
-    int hostaddr, type;
+void
+kalog_log(char *principal, char *instance, char *sprincipal, char *sinstance,
+         char *realm, int hostaddr, int type)
 {
-    char keybuf[512]; /* not random! 63 . 63 , 63 . 63 max key */
+    char keybuf[512];          /* not random! 63 . 63 , 63 . 63 max key */
     datum key, data;
     kalog_elt rdata;
 
-    if (!kalog_db) return;
+    if (!kalog_db)
+       return;
     if (*principal)
-         strcpy(keybuf, principal);
+       strcpy(keybuf, principal);
     if (realm) {
        strcat(keybuf, "@");
        strcat(keybuf, realm);
@@ -79,46 +89,49 @@ kalog_log(principal, instance, sprincipal, sinstance, realm, hostaddr, type)
            strcat(keybuf, ".");
            strcat(keybuf, sinstance);
        }
-    } 
-    switch(type) {
-      case LOG_CRUSER:
+    }
+    switch (type) {
+    case LOG_CRUSER:
        strcat(keybuf, ":cruser");
        break;
-      case LOG_CHPASSWD:
+    case LOG_CHPASSWD:
        strcat(keybuf, ":chp");
        break;
-      case LOG_AUTHENTICATE:
+    case LOG_AUTHENTICATE:
        strcat(keybuf, ":auth");
        break;
-      case LOG_AUTHFAILED:
+    case LOG_AUTHFAILED:
        strcat(keybuf, ":authnot");
        break;
-      case LOG_SETFIELDS:
+    case LOG_SETFIELDS:
        strcat(keybuf, ":setf");
        break;
-      case LOG_DELUSER:
+    case LOG_DELUSER:
        strcat(keybuf, ":delu");
        break;
-      case LOG_UNLOCK:
+    case LOG_UNLOCK:
        strcat(keybuf, ":unlok");
        break;
-      case LOG_GETTICKET:
+    case LOG_GETTICKET:
        strcat(keybuf, ":gtck");
        break;
-      default:
+    case LOG_TGTREQUEST:
+       strcat(keybuf, ":tgtreq");
+       break;
+    default:
        break;
     }
-    
+
     key.dptr = keybuf;
-    key.dsize = strlen(keybuf) + 1; /* store the key in a string w/ null */
+    key.dsize = strlen(keybuf) + 1;    /* store the key in a string w/ null */
     rdata.last_use = time((time_t *) 0);
     rdata.host = hostaddr;
-    data.dptr = (char *) &rdata;
+    data.dptr = (char *)&rdata;
     data.dsize = sizeof(kalog_elt);
 
     dbm_store(kalog_db, key, data, DBM_REPLACE);
 
-    ViceLog(verbose_track, ("%s from %x\n", keybuf, hostaddr));
+    ViceLog(verbose_track, ("%s from %s\n", keybuf, afs_inet_ntoa(hostaddr)));
 }
 
 
@@ -126,13 +139,14 @@ kalog_log(principal, instance, sprincipal, sinstance, realm, hostaddr, type)
 
 
 /* log a ticket usage to the text log */
-void ka_log(char *principal, char *instance, char *sprincipal, char *sinstance, 
+void
+ka_log(char *principal, char *instance, char *sprincipal, char *sinstance,
        char *realm, int hostaddr, int type)
 {
-    char logbuf[512]; /* not random! 63 . 63 , 63 . 63 max key */
+    char logbuf[512];          /* not random! 63 . 63 , 63 . 63 max key */
 
     if (*principal)
-         strcpy(logbuf, principal);
+       strcpy(logbuf, principal);
     if (realm) {
        strcat(logbuf, "@");
        strcat(logbuf, realm);
@@ -150,35 +164,38 @@ void ka_log(char *principal, char *instance, char *sprincipal, char *sinstance,
            strcat(logbuf, ".");
            strcat(logbuf, sinstance);
        }
-    } 
-    switch(type) {
-      case LOG_CRUSER:
+    }
+    switch (type) {
+    case LOG_CRUSER:
        strcat(logbuf, ":cruser");
        break;
-      case LOG_CHPASSWD:
+    case LOG_CHPASSWD:
        strcat(logbuf, ":chp");
        break;
-      case LOG_AUTHENTICATE:
+    case LOG_AUTHENTICATE:
        strcat(logbuf, ":auth");
        break;
-      case LOG_AUTHFAILED:
+    case LOG_AUTHFAILED:
        strcat(logbuf, ":authnot");
        break;
-      case LOG_SETFIELDS:
+    case LOG_SETFIELDS:
        strcat(logbuf, ":setf");
        break;
-      case LOG_DELUSER:
+    case LOG_DELUSER:
        strcat(logbuf, ":delu");
        break;
-      case LOG_UNLOCK:
+    case LOG_UNLOCK:
        strcat(logbuf, ":unlok");
        break;
-      case LOG_GETTICKET:
+    case LOG_GETTICKET:
        strcat(logbuf, ":gtck");
        break;
-      default:
+    case LOG_TGTREQUEST:
+        strcat(logbuf, ":tgtreq");
+        break;
+    default:
        break;
     }
-    
-    ViceLog(verbose_track, ("%s from %x\n", logbuf, hostaddr));
+
+    ViceLog(verbose_track, ("%s from %s\n", logbuf, afs_inet_ntoa(hostaddr)));
 }