The branch, master has been updated
via ab5cdb3 Revert "s3:build: for now do not require
gsskrb5_extract_authz_data_from_sec_context"
via 23ddaa8 Revert "build: Add -lz to wbinfo to fix build on some hosts"
from 9e6675e s3: improve the code in the AES encryption.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ab5cdb31e98396fabce1e6f9d7fafe91d5a839d8
Author: Stefan Metzmacher <[email protected]>
Date: Tue Jan 24 11:17:09 2012 +0100
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 <[email protected]>
Autobuild-Date: Wed Jan 25 05:26:14 CET 2012 on sn-devel-104
commit 23ddaa858cc83085cbd4017fdb5b6bba870b8c1a
Author: Stefan Metzmacher <[email protected]>
Date: Tue Jan 24 14:12:12 2012 +0100
Revert "build: Add -lz to wbinfo to fix build on some hosts"
This reverts commit 88daf798fec56a99e5eb3aed67f3b58572d97d34.
This is not needed as 5c88cfcc525290d0ad1c322401685c60c1abdf10 is the better
fix, see https://bugzilla.samba.org/show_bug.cgi?id=8711
metze
-----------------------------------------------------------------------
Summary of changes:
source3/Makefile.in | 2 +-
source3/configure.in | 11 ++++++-----
source3/wscript | 8 +++-----
3 files changed, 10 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 63ea283..a405a18 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3137,7 +3137,7 @@ bin/wbinfo@EXEEXT@: $(BINARY_PREREQS) $(WBINFO_OBJ)
@BUILD_POPT@ $(LIBTALLOC) $(
@echo Linking $@
@$(CC) -o $@ $(LDFLAGS) $(WBINFO_OBJ) $(DYNEXP) $(LIBS) \
$(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
- $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
+ $(LIBWBCLIENT_LIBS)
bin/ntlm_auth@EXEEXT@: $(BINARY_PREREQS) $(NTLM_AUTH_OBJ) $(PARAM_OBJ) \
$(LIB_NONSMBD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
diff --git a/source3/configure.in b/source3/configure.in
index b1a3c08..1e09e48 100644
--- 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 552735f..1a5a5c4 100644
--- 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:
--
Samba Shared Repository
