Revert "s3:build: for now do not require gsskrb5_extract_authz_data_from_sec_context"

This reverts commit 74abe369df26c58094a601dd6ff8c27c3d0b2b2a.

Having gsskrb5_extract_authz_data_from_sec_context as symbol in the
library is in indicator that gss_inquire_sec_context_by_oid() would work.

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Wed Jan 25 05:26:14 CET 2012 on sn-devel-104

diff --git a/source3/configure.in b/source3/configure.in
index b1a3c08d294a4941c0aaf33dfc4d06e85e056565..1e09e482862afff8ea211e3cd9d0fb7c90e209f3 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -4517,12 +4517,13 @@ if test x"$with_ads_support" != x"no"; then
 
   fi
 
-  # 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)
+  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)
       use_ads=no
+    fi
   fi
 
   if test x"$use_ads" = x"yes"; then

diff --git a/source3/wscript b/source3/wscript
index 552735f64f317adde50bff8165d5a7c996b05857..1a5a5c4b2390ef421313d217faad24644c8a454f 100644 (file)
--- a/source3/wscript
+++ b/source3/wscript
@@ -805,12 +805,10 @@ 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_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")
+            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")
             use_ads=False
 
         if use_ads: