svn commit: samba r4379 - in branches/SAMBA_4_0/source: include/system libads

[abartlet at samba.org]

Author: abartlet
Date: 2004-12-28 22:29:48 +0000 (Tue, 28 Dec 2004)
New Revision: 4379

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4379

Log:
Merge more Kerberos related configure checks (by jra, gd and Lars
Mueller <lmuelle at suse.de>) from 3.0 to Samba4.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/include/system/kerberos.h
   branches/SAMBA_4_0/source/libads/config.m4


Changeset:
Modified: branches/SAMBA_4_0/source/include/system/kerberos.h
===================================================================
--- branches/SAMBA_4_0/source/include/system/kerberos.h	2004-12-28 07:57:31 UTC (rev 4378)
+++ branches/SAMBA_4_0/source/include/system/kerberos.h	2004-12-28 22:29:48 UTC (rev 4379)
@@ -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
 

Modified: branches/SAMBA_4_0/source/libads/config.m4
===================================================================
--- branches/SAMBA_4_0/source/libads/config.m4	2004-12-28 07:57:31 UTC (rev 4378)
+++ branches/SAMBA_4_0/source/libads/config.m4	2004-12-28 22:29:48 UTC (rev 4379)
@@ -496,12 +496,10 @@
 			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])