From 7dd1049a4651628a7053f1cb8c4a6dfed4da0378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Thu, 23 Jun 2005 13:56:09 +0000
Subject: [PATCH] log the kaserver requests, avoid shadowing variables

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15511 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 kdc/kaserver.c | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/kdc/kaserver.c b/kdc/kaserver.c
index f3309bc31..b7a66b8e0 100644
--- a/kdc/kaserver.c
+++ b/kdc/kaserver.c
@@ -391,6 +391,7 @@ static void
 do_authenticate (struct rx_header *hdr,
 		 krb5_storage *sp,
 		 struct sockaddr_in *addr,
+		 const char *from,
 		 krb5_data *reply)
 {
     krb5_error_code ret;
@@ -422,6 +423,11 @@ do_authenticate (struct rx_header *hdr,
 
     snprintf (client_name, sizeof(client_name), "%s.%s@%s",
 	      name, instance, v4_realm);
+    snprintf (server_name, sizeof(server_name), "%s.%s@%s",
+	      "krbtgt", v4_realm, v4_realm);
+
+    kdc_log(0, "AS-REQ (kaserver) %s from %s for %s",
+	    client_name, from, server_name);
 
     ret = db_fetch4 (name, instance, v4_realm, &client_entry);
     if (ret) {
@@ -431,9 +437,6 @@ do_authenticate (struct rx_header *hdr,
 	goto out;
     }
 
-    snprintf (server_name, sizeof(server_name), "%s.%s@%s",
-	      "krbtgt", v4_realm, v4_realm);
-
     ret = db_fetch4 ("krbtgt", v4_realm, v4_realm, &server_entry);
     if (ret) {
 	kdc_log(0, "Server not found in database: %s: %s",
@@ -593,6 +596,7 @@ static void
 do_getticket (struct rx_header *hdr,
 	      krb5_storage *sp,
 	      struct sockaddr_in *addr,
+	      const char *from,
 	      krb5_data *reply)
 {
     krb5_error_code ret;
@@ -707,6 +711,9 @@ do_getticket (struct rx_header *hdr,
     snprintf (client_name, sizeof(client_name),
 	      "%s.%s@%s", ad.pname, ad.pinst, ad.prealm);
 
+    kdc_log(0, "TGS-REQ (kaserver) %s from %s for %s",
+	    client_name, from, server_name);
+
     ret = db_fetch4 (ad.pname, ad.pinst, ad.prealm, &client_entry);
     if(ret && ret != HDB_ERR_NOENTRY) {
 	kdc_log(0, "Client not found in database: (krb4) %s: %s",
@@ -741,15 +748,15 @@ do_getticket (struct rx_header *hdr,
 
     /* and extract them */
     {
-	krb5_storage *sp;
+	krb5_storage *tsp;
 	int32_t tmp;
 
-	sp = krb5_storage_from_mem (times.data, times.length);
-	krb5_ret_int32 (sp, &tmp);
+	tsp = krb5_storage_from_mem (times.data, times.length);
+	krb5_ret_int32 (tsp, &tmp);
 	start_time = tmp;
-	krb5_ret_int32 (sp, &tmp);
+	krb5_ret_int32 (tsp, &tmp);
 	end_time = tmp;
-	krb5_storage_free (sp);
+	krb5_storage_free (tsp);
     }
 
     /* life */
@@ -845,10 +852,10 @@ do_kaserver(unsigned char *buf,
     switch (op) {
     case AUTHENTICATE :
     case AUTHENTICATE_V2 :
-	do_authenticate (&hdr, sp, addr, reply);
+	do_authenticate (&hdr, sp, addr, from, reply);
 	break;
     case GETTICKET :
-	do_getticket (&hdr, sp, addr, reply);
+	do_getticket (&hdr, sp, addr, from, reply);
 	break;
     case AUTHENTICATE_OLD :
     case CHANGEPASSWORD :