svn commit: samba r1794 - in branches/SAMBA_4_0/source: libads libcli/auth

[metze at samba.org]

Author: metze
Date: 2004-08-12 22:25:49 +0000 (Thu, 12 Aug 2004)
New Revision: 1794
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source&rev=1794&nolog=1
Log:
fix the build MIT krb5

metze

Modified:
   branches/SAMBA_4_0/source/libads/config.m4
   branches/SAMBA_4_0/source/libcli/auth/gensec_krb5.c
   branches/SAMBA_4_0/source/libcli/auth/kerberos_verify.c

Changeset:
Modified: branches/SAMBA_4_0/source/libads/config.m4
===================================================================
--- branches/SAMBA_4_0/source/libads/config.m4	2004-08-12 22:25:01 UTC (rev 1793)
+++ branches/SAMBA_4_0/source/libads/config.m4	2004-08-12 22:25:49 UTC (rev 1794)
@@ -286,6 +286,9 @@
   AC_CHECK_FUNC_EXT(krb5_free_unparsed_name, $KRB5_LIBS)
   AC_CHECK_FUNC_EXT(krb5_free_keytab_entry_contents, $KRB5_LIBS)
   AC_CHECK_FUNC_EXT(krb5_kt_free_entry, $KRB5_LIBS)
+  AC_CHECK_FUNC_EXT(krb5_verify_checksum, $KRB5_LIBS)
+  AC_CHECK_FUNC_EXT(krb5_c_verify_checksum, $KRB5_LIBS)
+  AC_CHECK_FUNC_EXT(krb5_ticket_get_authorization_data_type, $KRB5_LIBS)
 
   LIBS="$LIBS $KRB5_LIBS"
   

Modified: branches/SAMBA_4_0/source/libcli/auth/gensec_krb5.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/auth/gensec_krb5.c	2004-08-12 22:25:01 UTC (rev 1793)
+++ branches/SAMBA_4_0/source/libcli/auth/gensec_krb5.c	2004-08-12 22:25:49 UTC (rev 1794)
@@ -47,6 +47,7 @@
 	krb5_keyblock krb5_keyblock;
 };
 
+#ifdef KRB5_DO_VERIFY_PAC
 static NTSTATUS gensec_krb5_pac_checksum(DATA_BLOB pac_data,
 					    struct PAC_SIGNATURE_DATA *sig,
 					    struct gensec_krb5_state *gensec_krb5_state,
@@ -95,6 +96,7 @@
 
 	return NT_STATUS_OK;
 }
+#endif
 
 static NTSTATUS gensec_krb5_decode_pac(TALLOC_CTX *mem_ctx,
 				struct PAC_LOGON_INFO *logon_info_out,
@@ -168,7 +170,7 @@
 		DEBUG(0,("PAC no kdc_key\n"));
 		return NT_STATUS_FOOBAR;
 	}
-
+#ifdef KRB5_DO_VERIFY_PAC
 	/* clear the kdc_key */
 /*	memset((void *)kdc_sig_ptr , '\0', sizeof(*kdc_sig_ptr));*/
 
@@ -214,7 +216,7 @@
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
 	}
-
+#endif
 	DEBUG(0,("account_name: %s [%s]\n",logon_info->account_name.string, logon_info->full_name.string));
 	*logon_info_out = *logon_info;
 

Modified: branches/SAMBA_4_0/source/libcli/auth/kerberos_verify.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/auth/kerberos_verify.c	2004-08-12 22:25:01 UTC (rev 1793)
+++ branches/SAMBA_4_0/source/libcli/auth/kerberos_verify.c	2004-08-12 22:25:49 UTC (rev 1794)
@@ -115,8 +115,7 @@
 				copy_EncryptionKey(&kt_entry.keyblock, keyblock);
 #else
 				keytype = (unsigned int) kt_entry.key.enctype;
-				/* I'not sure if that works --metze*/
-				copy_EncryptionKey(&kt_entry.key, keyblock);
+				/* TODO: copy the keyblock on MIT krb5*/
 #endif
 				DEBUG(10,("ads_keytab_verify_ticket: enc type [%u] decrypted message !\n",
 					  keytype));
@@ -214,7 +213,7 @@
 			break;
 		}
 
-		free_EncryptionKey(keyblock);
+		krb5_free_keyblock(context, keyblock);
 
 		DEBUG((ret != KRB5_BAD_ENCTYPE) ? 3 : 10,
 				("ads_secrets_verify_ticket: enc type [%u] failed to decrypt with error %s\n",