[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  890485b heimdal: Cope with newer Heimdal versions accepting a keyset argument to hdb_enctype2key.
      from  4754743 s3:registry: let reg_values_need_update() return true if the backend does not implement the method

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 890485bd17142ac9bbaf71c24d3d3ec1fa4a6724
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon May 7 16:43:17 2012 +0200

    heimdal: Cope with newer Heimdal versions accepting a keyset argument to
    hdb_enctype2key.
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Mon May  7 18:33:10 CEST 2012 on sn-devel-104

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

Summary of changes:
 source4/heimdal_build/wscript_configure |   26 ++++++++++++++++++++++----
 source4/kdc/pac-glue.c                  |    4 ++++
 2 files changed, 26 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure
index a350a8b..619944d 100755
--- a/source4/heimdal_build/wscript_configure
+++ b/source4/heimdal_build/wscript_configure
@@ -213,15 +213,33 @@ check_system_heimdal_lib("gssapi", "gss_oid_to_name", "gssapi.h",
     onlyif="hcrypto asn1 roken krb5 com_err wind")
 check_system_heimdal_lib("heimntlm", "heim_ntlm_ntlmv2_key", "heimntlm.h",
     onlyif="roken hcrypto krb5")
-check_system_heimdal_lib("hdb", "hdb_db_dir", "krb5.h hdb.h",
-    onlyif="roken krb5 hcrypto com_err wind")
+if check_system_heimdal_lib("hdb", "hdb_db_dir", "krb5.h hdb.h",
+    onlyif="roken krb5 hcrypto com_err wind"):
+    CCDEFINES = list(conf.env.CCDEFINES)
+    conf.undefine("HAVE_CONFIG_H")
+    while "HAVE_CONFIG_H=1" in conf.env.CCDEFINES:
+        conf.env.CCDEFINES.remove("HAVE_CONFIG_H=1")
+    try:
+        conf.CHECK_CODE('''
+            #include <hdb.h>
+            int main(void) { hdb_enctype2key(NULL, NULL, NULL, 0, NULL); }
+            ''',
+            define='HDB_ENCTYPE2KEY_TAKES_KEYSET',
+            addmain=False,
+            lib='hdb',
+            msg='Checking whether hdb_enctype2key takes a keyset argument',
+            local_include=False)
+    finally:
+        conf.env.CCDEFINES = CCDEFINES
+        conf.define("HAVE_CONFIG_H", "1")
+
 check_system_heimdal_lib("kdc", "kdc_log", "kdc.h",
     onlyif="roken krb5 hdb asn1 heimntlm hcrypto com_err wind heimbase")
 
 
 # With the proper checks in place we should be able to build against the system libtommath.
-# conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h')
-# conf.define('USING_SYSTEM_TOMMATH', 1)
+#if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'):
+#    conf.define('USING_SYSTEM_TOMMATH', 1)
 
 check_system_heimdal_binary("compile_et")
 check_system_heimdal_binary("asn1_compile")
diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c
index d654dc3..cca74d8 100644
--- a/source4/kdc/pac-glue.c
+++ b/source4/kdc/pac-glue.c
@@ -482,7 +482,11 @@ int kdc_check_pac(krb5_context context,
 		}
 	}
 
+#if HDB_ENCTYPE2KEY_TAKES_KEYSET
+	ret = hdb_enctype2key(context, &ent->entry, NULL, etype, &key);
+#else
 	ret = hdb_enctype2key(context, &ent->entry, etype, &key);
+#endif
 
 	if (ret != 0) {
 		return ret;


-- 
Samba Shared Repository