From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 20 Jan 2012 15:55:43 +0000 (+0100)
Subject: s3:build: for now do not require gsskrb5_extract_authz_data_from_sec_context
X-Git-Tag: tevent-0.9.15~295
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74abe369df26c58094a601dd6ff8c27c3d0b2b2a;p=thirdparty%2Fsamba.git

s3:build: for now do not require gsskrb5_extract_authz_data_from_sec_context

We do not use it yet.

metze
---

diff --git a/source3/configure.in b/source3/configure.in
index a5b4487fa21..3ba2c8b6951 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -4517,13 +4517,12 @@ if test x"$with_ads_support" != x"no"; then
 
   fi
 
-  if test x"$ac_cv_func_ext_gss_get_name_attribute" != x"yes" ; then
-    if test x"$ac_cv_func_ext_gsskrb5_extract_authz_data_from_sec_context" != x"yes" -o \
-            x"$ac_cv_func_ext_gss_inquire_sec_context_by_oid" != x"yes"
-    then
-      AC_MSG_WARN(need either gss_get_name_attribute or gsskrb5_extract_authz_data_from_sec_context and gss_inquire_sec_context_by_oid in -lgssapi for PAC support)
+  # for now do not require gsskrb5_extract_authz_data_from_sec_context
+  # as we do not use it
+  if test x"$ac_cv_func_ext_gss_get_name_attribute" != x"yes" -a \
+          x"$ac_cv_func_ext_gss_inquire_sec_context_by_oid" != x"yes"; then
+      AC_MSG_WARN(need either gss_get_name_attribute or gss_inquire_sec_context_by_oid in -lgssapi for PAC support)
       use_ads=no
-    fi
   fi
 
   if test x"$use_ads" = x"yes"; then
diff --git a/source3/wscript b/source3/wscript
index 1a5a5c4b239..552735f64f3 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -805,10 +805,12 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab);
         # gsskrb5_extract_authz_data_from_sec_context, but it is a
         # clue that this Heimdal, which does the PAC processing we
         # need on the standard gss_inquire_sec_context_by_oid
+        #
+        # For now do not require gsskrb5_extract_authz_data_from_sec_context,
+        # as we do not use it.
         if not conf.CONFIG_SET('HAVE_GSS_GET_NAME_ATTRIBUTE') and \
-            not (conf.CONFIG_SET('HAVE_GSSKRB5_EXTRACT_AUTHZ_DATA_FROM_SEC_CONTEXT') and \
-                     conf.CONFIG_SET('HAVE_GSS_INQUIRE_SEC_CONTEXT_BY_OID')):
-            Logs.warn("need eiterh gss_get_name_attribute or gsskrb5_extract_authz_data_from_sec_context and gss_inquire_sec_context_by_oid in -lgssapi for PAC support")
+            not conf.CONFIG_SET('HAVE_GSS_INQUIRE_SEC_CONTEXT_BY_OID'):
+            Logs.warn("need eiterh gss_get_name_attribute or gss_inquire_sec_context_by_oid in -lgssapi for PAC support")
             use_ads=False
 
         if use_ads: