r4379: Merge more Kerberos related configure checks (by jra, gd and Lars

Mueller <lmuelle@suse.de>) from 3.0 to Samba4.

Andrew Bartlett
(This used to be commit 9c74e04098d50427f93219a6a451c44a2373db46)

diff --git a/source4/include/system/kerberos.h b/source4/include/system/kerberos.h
index 85c635e22330e78211f56f29c749cb6f5ba8113c..392300267e10ace0211c03e9a62fd279750883e3 100644 (file)
--- a/source4/include/system/kerberos.h
+++ b/source4/include/system/kerberos.h
@@ -29,13 +29,9 @@
 
 #ifdef HAVE_GSSAPI_H
 #include <gssapi.h>
-#endif
-
-#ifdef HAVE_GSSAPI_GSSAPI_H
+#elif defined(HAVE_GSSAPI_GSSAPI_H)
 #include <gssapi/gssapi.h>
-#endif
-
-#ifdef HAVE_GSSAPI_GSSAPI_GENERIC_H
+#elif defined(HAVE_GSSAPI_GSSAPI_GENERIC_H)
 #include <gssapi/gssapi_generic.h>
 #endif
 

diff --git a/source4/libads/config.m4 b/source4/libads/config.m4
index d91682da2d0f8d7f408ce5ad32d24e030c2aa493..c3f1da6e072a2f9c4fd4ecc55f8c1c59af31d657 100644 (file)
--- 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])