[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  c41d3c1 s3:configure.in: move gss_wrap_iov check to the other function checks
       via  fbb292e s3:configure.in: require gssapi for ads support
       via  004906e s3:configure.in: move krb5_set_real_time check to other function checks
       via  74abe36 s3:build: for now do not require gsskrb5_extract_authz_data_from_sec_context
       via  018af56 s3:configure.in: fix the shell logic in krb5 checks
      from  3bfcf34 torture: add spoolss overlapping driver deletion tests

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit c41d3c187e342f448c6700cde17c88955579b26c
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Jan 20 16:59:10 2012 +0100

    s3:configure.in: move gss_wrap_iov check to the other function checks
    
    This also makes sure we search for it if it's in -lgssapi
    instead of -lgssapi_krb5 or -lgss.
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Fri Jan 20 20:23:13 CET 2012 on sn-devel-104

commit fbb292ec14ac36c1ef2e655c3c1aa268cbdb34f3
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Jan 20 16:58:14 2012 +0100

    s3:configure.in: require gssapi for ads support
    
    This matches the waf checks.
    
    metze

commit 004906e73c03f0351d06bcd5bb79dcf50316bf23
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Jan 20 16:56:47 2012 +0100

    s3:configure.in: move krb5_set_real_time check to other function checks
    
    metze

commit 74abe369df26c58094a601dd6ff8c27c3d0b2b2a
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Jan 20 16:55:43 2012 +0100

    s3:build: for now do not require gsskrb5_extract_authz_data_from_sec_context
    
    We do not use it yet.
    
    metze

commit 018af56bf2da2f8445bbef2c8be2a65475b528ea
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Jan 20 16:52:03 2012 +0100

    s3:configure.in: fix the shell logic in krb5 checks
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source3/configure.in |   17 ++++++++---------
 source3/wscript      |    8 +++++---
 2 files changed, 13 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 3102ad0..b1a3c08 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3844,16 +3844,15 @@ if test x"$with_ads_support" != x"no"; then
   if test x"$have_gssapi" != x"yes"; then
      AC_CHECK_LIB_EXT(gssapi_krb5, KRB5_LIBS,gss_display_status,[],[],have_gssapi=yes)
      AC_CHECK_LIB_EXT(gss, KRB5_LIBS,gss_display_status,[],[],have_gssapi=yes)
-     AC_CHECK_FUNC_EXT(gss_wrap_iov, $KRB5_LIBS)
   fi
-
-  AC_CHECK_FUNC_EXT(krb5_set_real_time, $KRB5_LIBS)
   ################################################################
   # test for AD / GSSAPI support being enabled
   if test x"$have_gssapi" != xyes ; then
   	AC_MSG_WARN([Samba cannot be supported without GSSAPI])
+	use_ads=no
   fi
 
+  AC_CHECK_FUNC_EXT(krb5_set_real_time, $KRB5_LIBS)
   AC_CHECK_FUNC_EXT(krb5_set_default_in_tkt_etypes, $KRB5_LIBS)
   AC_CHECK_FUNC_EXT(krb5_set_default_tgs_enctypes, $KRB5_LIBS)
   AC_CHECK_FUNC_EXT(krb5_set_default_tgs_ktypes, $KRB5_LIBS)
@@ -3905,6 +3904,7 @@ if test x"$with_ads_support" != x"no"; then
   AC_CHECK_FUNC_EXT(gss_mech_krb5, $KRB5_LIBS)
   AC_CHECK_FUNC_EXT(gss_oid_equal, $KRB5_LIBS)
   AC_CHECK_FUNC_EXT(gss_inquire_sec_context_by_oid, $KRB5_LIBS)
+  AC_CHECK_FUNC_EXT(gss_wrap_iov, $KRB5_LIBS)
 
   # This is for FreeBSD (and possibly others). gss_mech_krb5 is a
   # #define to GSS_KRB5_MECHANISM, which is defined in -lgssapi_krb5
@@ -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 \
-    if test 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 1a5a5c4..552735f 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:


-- 
Samba Shared Repository