sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-08 05:57:51 +03:00
Code

heimdal: Cope with newer Heimdal versions accepting a keyset argument to

Browse Source 
hdb_enctype2key.

Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Mon May  7 18:33:10 CEST 2012 on sn-devel-104
This commit is contained in:
Jelmer Vernooij 2012-05-07 16:43:17 +02:00
parent 4754743860
commit 890485bd17
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source4/heimdal_build/wscript_configure
View File

@ -213,15 +213,33 @@ check_system_heimdal_lib("gssapi", "gss_oid_to_name", "gssapi.h",
onlyif="hcrypto asn1 roken krb5 com_err wind") onlyif="hcrypto asn1 roken krb5 com_err wind")
check_system_heimdal_lib("heimntlm", "heim_ntlm_ntlmv2_key", "heimntlm.h", check_system_heimdal_lib("heimntlm", "heim_ntlm_ntlmv2_key", "heimntlm.h",
onlyif="roken hcrypto krb5") onlyif="roken hcrypto krb5")
check_system_heimdal_lib("hdb", "hdb_db_dir", "krb5.h hdb.h", if check_system_heimdal_lib("hdb", "hdb_db_dir", "krb5.h hdb.h",
onlyif="roken krb5 hcrypto com_err wind") 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", check_system_heimdal_lib("kdc", "kdc_log", "kdc.h",
onlyif="roken krb5 hdb asn1 heimntlm hcrypto com_err wind heimbase") 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. # 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') #if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'):
# conf.define('USING_SYSTEM_TOMMATH', 1) # conf.define('USING_SYSTEM_TOMMATH', 1)
check_system_heimdal_binary("compile_et") check_system_heimdal_binary("compile_et")
check_system_heimdal_binary("asn1_compile") check_system_heimdal_binary("asn1_compile")

4
source4/kdc/pac-glue.c
View File

@ -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); ret = hdb_enctype2key(context, &ent->entry, etype, &key);
#endif
if (ret != 0) { if (ret != 0) {
return ret; return ret;