From: Russ Allbery <rra@stanford.edu>
Date: Wed, 6 Dec 2006 20:00:48 +0000 (+0000)
Subject: kaserver-log-tgtreq-20061206
X-Git-Tag: BP-openafs-windows-kdfs-ifs~924
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=08bb3f639163be663d69c9b2188b694e6644cd00;p=packages%2Fo%2Fopenafs.git

kaserver-log-tgtreq-20061206


Separately log TGT requests in addition to logging the authentication so
that one can distinguish in the logs between Kerberos v4 clients and uses
of klog.
---

diff --git a/src/kauth/kalog.c b/src/kauth/kalog.c
index 4dc61e118..85b6bea61 100644
--- a/src/kauth/kalog.c
+++ b/src/kauth/kalog.c
@@ -115,6 +115,9 @@ kalog_log(char *principal, char *instance, char *sprincipal, char *sinstance,
     case LOG_GETTICKET:
 	strcat(keybuf, ":gtck");
 	break;
+    case LOG_TGTREQUEST:
+	strcat(keybuf, ":tgtreq");
+	break;
     default:
 	break;
     }
@@ -187,6 +190,9 @@ ka_log(char *principal, char *instance, char *sprincipal, char *sinstance,
     case LOG_GETTICKET:
 	strcat(logbuf, ":gtck");
 	break;
+    case LOG_TGTREQUEST:
+        strcat(logbuf, ":tgtreq");
+        break;
     default:
 	break;
     }
diff --git a/src/kauth/kalog.h b/src/kauth/kalog.h
index ffc04f97a..0ae6c681c 100644
--- a/src/kauth/kalog.h
+++ b/src/kauth/kalog.h
@@ -27,6 +27,7 @@ typedef struct {
 #define	LOG_SETFIELDS		5
 #define	LOG_UNLOCK              6
 #define	LOG_AUTHFAILED	        7
+#define	LOG_TGTREQUEST		8
 
 #ifdef AUTH_DBM_LOG
 #ifdef AFS_LINUX20_ENV
diff --git a/src/kauth/krb_udp.c b/src/kauth/krb_udp.c
index b894c8cce..2222b369a 100644
--- a/src/kauth/krb_udp.c
+++ b/src/kauth/krb_udp.c
@@ -399,6 +399,11 @@ UDP_Authenticate(ksoc, client, name, inst, startTime, endTime, sname, sinst)
     }
     KALOG(name, inst, sname, sinst, NULL, client->sin_addr.s_addr,
 	  LOG_AUTHENTICATE);
+
+    if (cipherLen != 0) {
+	KALOG(name, inst, sname, sinst, NULL, client->sin_addr.s_addr,
+	      LOG_TGTREQUEST);
+    }
     osi_audit(UDPAuthenticateEvent, 0, AUD_STR, name, AUD_STR, inst, AUD_END);
     return 0;