From b452fb30f79c5effa508b891bcb453de8f452286 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Thu, 24 May 2012 16:28:31 +0300 Subject: [PATCH] waf: for MIT krb5 build require kerberos version above 1.9 MIT krb5 implementation provides sufficient support for features used in Samba 4 starting with 1.9. Require version above when using system MIT krb5 build. Autobuild-User: Alexander Bokovoy Autobuild-Date: Thu May 24 18:15:36 CEST 2012 on sn-devel-104 --- wscript_configure_system_mitkrb5 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/wscript_configure_system_mitkrb5 b/wscript_configure_system_mitkrb5 index 7523103556b..805c45293bc 100644 --- a/wscript_configure_system_mitkrb5 +++ b/wscript_configure_system_mitkrb5 @@ -1,4 +1,4 @@ -import Logs, Options +import Logs, Options, sys # Check for kerberos have_gssapi=False @@ -30,6 +30,13 @@ if conf.env.KRB5_CONFIG: if conf.env.KRB5_VENDOR != 'heimdal': conf.define('USING_SYSTEM_KRB5', 1) del conf.env.HEIMDAL_KRB5_CONFIG + kversion = conf.cmd_and_log("%(path)s --version" % dict(path=conf.env.KRB5_CONFIG), dict()).strip() + kversion_split = map(int, kversion.split(" ")[-1].split(".")) + if kversion_split < [1, 9]: + Logs.error('ERROR: MIT krb5 build requires at least 1.9.0. %s is found and cannot be used' % (kversion)) + sys.exit(1) + else: + Logs.info('%s is detected, MIT krb5 build can proceed' % (kversion)) conf.check_cfg(args="--cflags --libs", package="com_err", uselib_store="com_err") conf.CHECK_FUNCS_IN('_et_list', 'com_err') -- 2.11.4.GIT