svn commit: samba r11350 - in branches/SAMBA_4_0/source/auth/kerberos: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-10-28 02:29:32 +0000 (Fri, 28 Oct 2005)
New Revision: 11350

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11350

Log:
Add some debugs to assist tracking down kerberos issues in future.
(Make it easy to see what was put into the keytab, so we can tell when
gssapi screams that it can't pull it out).

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/auth/kerberos/kerberos_util.c


Changeset:
Modified: branches/SAMBA_4_0/source/auth/kerberos/kerberos_util.c
===================================================================
--- branches/SAMBA_4_0/source/auth/kerberos/kerberos_util.c	2005-10-28 02:13:14 UTC (rev 11349)
+++ branches/SAMBA_4_0/source/auth/kerberos/kerberos_util.c	2005-10-28 02:29:32 UTC (rev 11350)
@@ -232,6 +232,7 @@
 	krb5_principal salt_princ;
 	krb5_principal princ;
 	krb5_keytab keytab;
+	char *enctype_string = NULL;
 
 	TALLOC_CTX *mem_ctx = talloc_new(parent_ctx);
 	if (!mem_ctx) {
@@ -257,7 +258,7 @@
 					      smb_krb5_context, 
 					      &salt_princ);
 	if (ret) {
-		DEBUG(1,("create_memory_keytab: maksing salt principal failed (%s)\n",
+		DEBUG(1,("create_memory_keytab: makeing salt principal failed (%s)\n",
 			 smb_get_krb5_error_message(smb_krb5_context->krb5_context, 
 						    ret, mem_ctx)));
 		talloc_free(mem_ctx);
@@ -266,7 +267,7 @@
 
 	ret = principal_from_credentials(mem_ctx, machine_account, smb_krb5_context, &princ);
 	if (ret) {
-		DEBUG(1,("create_memory_keytab: maksing krb5 principal failed (%s)\n",
+		DEBUG(1,("create_memory_keytab: makeing krb5 principal failed (%s)\n",
 			 smb_get_krb5_error_message(smb_krb5_context->krb5_context, 
 						    ret, mem_ctx)));
 		talloc_free(mem_ctx);
@@ -311,6 +312,13 @@
 			return ret;
 		}
 		
+		krb5_keytype_to_string(smb_krb5_context->krb5_context, ENCTYPE_ARCFOUR_HMAC, &enctype_string);
+		DEBUG(5, ("Added %s(kvno %d) to keytab (%s)\n", 
+			  cli_credentials_get_principal(machine_account, mem_ctx),
+			  cli_credentials_get_kvno(machine_account),
+			  enctype_string));
+		free(enctype_string);		
+
 		krb5_free_keyblock_contents(smb_krb5_context->krb5_context, &entry.keyblock);
 
 		talloc_steal(parent_ctx, *keytab_container);
@@ -354,6 +362,14 @@
 			krb5_free_keyblock_contents(smb_krb5_context->krb5_context, &entry.keyblock);
 			return ret;
 		}
+
+		enctype_string = NULL;
+		krb5_keytype_to_string(smb_krb5_context->krb5_context, enctypes[i], &enctype_string);
+		DEBUG(5, ("Added %s(kvno %d) to keytab (%s)\n", 
+			  cli_credentials_get_principal(machine_account, mem_ctx),
+			  cli_credentials_get_kvno(machine_account),
+			  enctype_string));
+		free(enctype_string);		
 		
 		krb5_free_keyblock_contents(smb_krb5_context->krb5_context, &entry.keyblock);
 	}
@@ -385,6 +401,14 @@
 				return ret;
 			}
 			
+			enctype_string = NULL;
+			krb5_keytype_to_string(smb_krb5_context->krb5_context, enctypes[i], &enctype_string);
+			DEBUG(5, ("Added %s(kvno %d) to keytab (%s)\n", 
+				  cli_credentials_get_principal(machine_account, mem_ctx),
+				  cli_credentials_get_kvno(machine_account),
+			  enctype_string));
+			free(enctype_string);		
+
 			krb5_free_keyblock_contents(smb_krb5_context->krb5_context, &entry.keyblock);
 		}
 	}