[SCM] Samba Shared Repository - branch v3-4-test updated

Karolin Seeger kseeger at samba.org
Tue Nov 24 05:11:19 MST 2009


The branch, v3-4-test has been updated
       via  af52655... clikrb5: Prefer krb5_free_keytab_entry_contents to krb5_kt_free_entry.
      from  f9a9e32... cifs.upcall: Fix Bug #6868: support building with Heimdal we well as with MIT.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit af52655be1852151421417035007cf3a127fdf34
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Jun 4 23:43:31 2009 +0200

    clikrb5: Prefer krb5_free_keytab_entry_contents to krb5_kt_free_entry.
    
    Both functions exist in MIT Kerberos >= 1.7, but only
    krb5_free_keytab_entry_contents has a prototype.
    (cherry picked from commit b65ba0e26c781647e097f3f6fa279c7f3f7f4bd2)
    
    Part of a fix for bug #6918 (Build breaks with krb5-client-1.7-6.1.i586).

-----------------------------------------------------------------------

Summary of changes:
 source3/libsmb/clikrb5.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c
index 6e6793b..1ccc7ec 100644
--- a/source3/libsmb/clikrb5.c
+++ b/source3/libsmb/clikrb5.c
@@ -924,10 +924,15 @@ failed:
 
  krb5_error_code smb_krb5_kt_free_entry(krb5_context context, krb5_keytab_entry *kt_entry)
 {
-#if defined(HAVE_KRB5_KT_FREE_ENTRY)
-	return krb5_kt_free_entry(context, kt_entry);
-#elif defined(HAVE_KRB5_FREE_KEYTAB_ENTRY_CONTENTS)
+/* Try krb5_free_keytab_entry_contents first, since 
+ * MIT Kerberos >= 1.7 has both krb5_free_keytab_entry_contents and 
+ * krb5_kt_free_entry but only has a prototype for the first, while the 
+ * second is considered private. 
+ */
+#if defined(HAVE_KRB5_FREE_KEYTAB_ENTRY_CONTENTS)
 	return krb5_free_keytab_entry_contents(context, kt_entry);
+#elif defined(HAVE_KRB5_KT_FREE_ENTRY)
+	return krb5_kt_free_entry(context, kt_entry);
 #else
 #error UNKNOWN_KT_FREE_FUNCTION
 #endif


-- 
Samba Shared Repository


More information about the samba-cvs mailing list