summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-02-10 12:42:47 +0100
committerGünther Deschner <gd@samba.org>2011-02-10 12:58:06 +0100
commit7de21e62946fdd74250be56bd33e9598237307c5 (patch)
tree198895ee5a07b0efa9345b09af2e8f5a48c94a75
parentfdd4d56405544b8c25fa3f24889726cb98506345 (diff)
downloadsamba-7de21e62946fdd74250be56bd33e9598237307c5.tar.gz
samba-7de21e62946fdd74250be56bd33e9598237307c5.tar.bz2
samba-7de21e62946fdd74250be56bd33e9598237307c5.zip
s3-waf: fix krb5 checks logic.
Guenther
-rw-r--r--source3/wscript11
1 files changed, 6 insertions, 5 deletions
diff --git a/source3/wscript b/source3/wscript
index 3aa5d2a467..655de13b1c 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -845,25 +845,26 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab);
if Options.options.with_ads:
use_ads=True
- if not conf.CONFIG_SET('HAVE_ENCTYPE_ARCFOUR_HMAC_MD5'):
+ if not conf.CONFIG_SET('HAVE_ENCTYPE_ARCFOUR_HMAC_MD5') and \
+ not conf.CONFIG_SET('HAVE_ENCTYPE_ARCFOUR_HMAC'):
print "arcfour-hmac-md5 encryption type not found in -lkrb5"
use_ads=False
if not conf.CONFIG_SET('HAVE_KRB5_MK_REQ_EXTENDED'):
print "krb5_mk_req_extended not found in -lkrb5"
use_ads=False
- if not conf.CONFIG_SET('HAVE_KRB5_PRINCIPAL2SALT') or \
+ if not conf.CONFIG_SET('HAVE_KRB5_PRINCIPAL2SALT') and \
not conf.CONFIG_SET('HAVE_KRB5_GET_PW_SALT'):
print "no CREATE_KEY_FUNCTIONS detected"
use_ads=False
- if not conf.CONFIG_SET('HAVE_KRB5_GET_PERMITTED_ENCTYPES') or \
+ if not conf.CONFIG_SET('HAVE_KRB5_GET_PERMITTED_ENCTYPES') and \
not conf.CONFIG_SET('HAVE_KRB5_GET_DEFAULT_IN_TKT_ETYPES'):
print "no GET_ENCTYPES_FUNCTIONS detected"
use_ads=False
- if not conf.CONFIG_SET('HAVE_KRB5_KT_FREE_ENTRY') or \
+ if not conf.CONFIG_SET('HAVE_KRB5_KT_FREE_ENTRY') and \
not conf.CONFIG_SET('HAVE_KRB5_FREE_KEYTAB_ENTRY_CONTENTS'):
print "no KT_FREE_FUNCTION detected"
use_ads=False
- if not conf.CONFIG_SET('HAVE_KRB5_C_VERIFY_CHECKSUM') or \
+ if not conf.CONFIG_SET('HAVE_KRB5_C_VERIFY_CHECKSUM') and \
not conf.CONFIG_SET('HAVE_KRB5_VERIFY_CHECKSUM'):
print "no KRB5_VERIFY_CHECKSUM_FUNCTION detected"
use_ads=False