sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

wscript_configure_system_mitkrb5: reject a system heimdal krb5-config

Browse Source 
Review with: git show -w

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Thu Dec  6 16:53:33 CET 2018 on sn-devel-144
This commit is contained in:
Stefan Metzmacher 2018-12-05 13:30:07 +01:00
parent bd4bdced5f
commit 2f68c436cc
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wscript_configure_system_mitkrb5
View File

@ -1,5 +1,5 @@
import sys
from waflib import Logs, Options
from waflib import Logs, Options, Errors
# Check for kerberos
have_gssapi=False
@ -56,7 +56,9 @@ if conf.env.KRB5_CONFIG:
vendor = conf.cmd_and_log(conf.env.KRB5_CONFIG+['--vendor'])
conf.env.KRB5_VENDOR = vendor.strip().lower()
if conf.env.KRB5_VENDOR != 'heimdal':
if conf.env.KRB5_VENDOR == 'heimdal':
raise Errors.WafError('--with-system-mitkrb5 cannot be used with system heimdal')
conf.define('USING_SYSTEM_KRB5', 1)
del conf.env.HEIMDAL_KRB5_CONFIG
krb5_conf_version = conf.cmd_and_log(conf.env.KRB5_CONFIG+['--version']).strip()