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

Karolin Seeger kseeger at samba.org
Tue Nov 24 05:14:15 MST 2009


The branch, v3-3-test has been updated
       via  f7f183a... clikrb5: Prefer krb5_free_keytab_entry_contents to krb5_kt_free_entry.
      from  67f1d0a... s3:idmap_ldap: trim the " chars from the location string in idmap_ldap_db_init

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


- Log -----------------------------------------------------------------
commit f7f183aba2c53426620bab7e934ce79b516dc4fc
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.
    
    Part of a fix for bug #6918 (Build breaks with krb5-client-1.7-6.1.i586).

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

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


Changeset truncated at 500 lines:

diff --git a/source/libsmb/clikrb5.c b/source/libsmb/clikrb5.c
index d8fe40b..3f995de 100644
--- a/source/libsmb/clikrb5.c
+++ b/source/libsmb/clikrb5.c
@@ -913,10 +913,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