From d5fd59967878c6c0f7e760f7a4d6155603fe0170 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 28 Dec 2004 22:29:48 +0000 Subject: r4379: Merge more Kerberos related configure checks (by jra, gd and Lars Mueller ) from 3.0 to Samba4. Andrew Bartlett (This used to be commit 9c74e04098d50427f93219a6a451c44a2373db46) --- source4/include/system/kerberos.h | 8 ++------ source4/libads/config.m4 | 8 +++----- 2 files changed, 5 insertions(+), 11 deletions(-) (limited to 'source4') diff --git a/source4/include/system/kerberos.h b/source4/include/system/kerberos.h index 85c635e223..392300267e 100644 --- a/source4/include/system/kerberos.h +++ b/source4/include/system/kerberos.h @@ -29,13 +29,9 @@ #ifdef HAVE_GSSAPI_H #include -#endif - -#ifdef HAVE_GSSAPI_GSSAPI_H +#elif defined(HAVE_GSSAPI_GSSAPI_H) #include -#endif - -#ifdef HAVE_GSSAPI_GSSAPI_GENERIC_H +#elif defined(HAVE_GSSAPI_GSSAPI_GENERIC_H) #include #endif diff --git a/source4/libads/config.m4 b/source4/libads/config.m4 index d91682da2d..c3f1da6e07 100644 --- a/source4/libads/config.m4 +++ b/source4/libads/config.m4 @@ -496,12 +496,10 @@ if test x"$with_krb5_support" != x"no"; then krb5_context context; krb5_keytab keytab; krb5_init_context(&context); - if (krb5_kt_resolve(context, "WRFILE:api", &keytab)) - exit(0); - exit(1); + return krb5_kt_resolve(context, "WRFILE:api", &keytab); }], - samba_cv_HAVE_WRFILE_KEYTAB=no, - samba_cv_HAVE_WRFILE_KEYTAB=yes)]) + samba_cv_HAVE_WRFILE_KEYTAB=yes, + samba_cv_HAVE_WRFILE_KEYTAB=no)]) if test x"$samba_cv_HAVE_WRFILE_KEYTAB" = x"yes"; then AC_DEFINE(HAVE_WRFILE_KEYTAB,1, [Whether the WRFILE:-keytab is supported]) -- cgit