The branch, v3-2-test has been updated via a5fb8b443a7c4ebf68ed005990683718c1092747 (commit) via ed559b4a59e826851cb9894f0e519eaedb523f9d (commit) via e37859164c35e8d908f3dfcc99226ee6773ba0a8 (commit) via 4f05b50d4c626f2c404bb4bfefb65998125b612f (commit) via 40aeb431604bd26fc543410de24593726ca0a01f (commit) from f21871c6d60e02ed53f060abbbfb2ef656cdc311 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log ----------------------------------------------------------------- commit a5fb8b443a7c4ebf68ed005990683718c1092747 Author: Stefan Metzmacher <[EMAIL PROTECTED]> Date: Tue Jan 15 13:57:58 2008 +0100 krb5_locator: winbind_krb5_locator.o doesn't need socket wrapper any more metze commit ed559b4a59e826851cb9894f0e519eaedb523f9d Author: Stefan Metzmacher <[EMAIL PROTECTED]> Date: Tue Jan 15 13:56:57 2008 +0100 nss_winbind: nss_winbind.so doesn't need socket wrapper any more metze commit e37859164c35e8d908f3dfcc99226ee6773ba0a8 Author: Stefan Metzmacher <[EMAIL PROTECTED]> Date: Tue Jan 15 13:56:15 2008 +0100 pam_winbind: pam_winbind.so doesn't need soecket wrapper any more metze commit 4f05b50d4c626f2c404bb4bfefb65998125b612f Author: Stefan Metzmacher <[EMAIL PROTECTED]> Date: Tue Jan 15 13:54:30 2008 +0100 libwbclient: libwbclient.so doesn't need socket nor nss wrapper any more metze commit 40aeb431604bd26fc543410de24593726ca0a01f Author: Stefan Metzmacher <[EMAIL PROTECTED]> Date: Tue Jan 15 13:52:19 2008 +0100 nsswitch/: we don't need socket or nss wrapper in the winbind client code As we don't need socket wrapper of nss wrapper in the winbind client code we disable the function macros so that we don't endup with swrap_close() or similar functions. metze ----------------------------------------------------------------------- Summary of changes: source/Makefile.in | 14 +++++++------- source/nsswitch/winbind_nss_config.h | 8 ++++++++ 2 files changed, 15 insertions(+), 7 deletions(-) Changeset truncated at 500 lines: diff --git a/source/Makefile.in b/source/Makefile.in index 1d48055..4260145 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -340,13 +340,13 @@ LIBADDNS_OBJ0 = libaddns/dnsrecord.o libaddns/dnsutils.o libaddns/dnssock.o \ libaddns/dnsgss.o libaddns/dnsmarshall.o LIBADDNS_OBJ = $(LIBADDNS_OBJ0) $(TALLOC_OBJ) -LIBWBCLIENT_OBJ = nsswitch/libwbclient/wbclient.o \ +LIBWBCLIENT_OBJ0 = nsswitch/libwbclient/wbclient.o \ nsswitch/libwbclient/wbc_util.o \ nsswitch/libwbclient/wbc_pwd.o \ nsswitch/libwbclient/wbc_idmap.o \ nsswitch/libwbclient/wbc_sid.o \ nsswitch/libwbclient/wbc_pam.o - +LIBWBCLIENT_OBJ = $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ) $(TALLOC_OBJ) $(LIBREPLACE_OBJ) LIBGPO_OBJ0 = libgpo/gpo_ldap.o libgpo/gpo_ini.o libgpo/gpo_util.o \ libgpo/gpo_fetch.o libgpo/gpo_filesync.o libgpo/gpo_sec.o @@ -672,7 +672,7 @@ RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \ $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(LDB_OBJ) PAM_WINBIND_OBJ = nsswitch/pam_winbind.o $(WBCOMMON_OBJ) \ - $(LIBREPLACE_OBJ) $(SOCKET_WRAPPER_OBJ) @BUILD_INIPARSER@ + $(LIBREPLACE_OBJ) @BUILD_INIPARSER@ LIBSMBCLIENT_OBJ = libsmb/libsmbclient.o libsmb/libsmb_compat.o \ libsmb/libsmb_cache.o \ @@ -929,7 +929,7 @@ WBINFO_OBJ = nsswitch/wbinfo.o $(LIBSAMBA_OBJ) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \ $(SECRETS_OBJ) $(POPT_LIB_OBJ) $(AFS_SETTOKEN_OBJ) $(RPC_PARSE_OBJ1) \ $(DOSERR_OBJ) lib/winbind_util.o @LIBWBCLIENT_STATIC@ -WINBIND_NSS_OBJ = $(WBCOMMON_OBJ) $(LIBREPLACE_OBJ) $(SOCKET_WRAPPER_OBJ) @WINBIND_NSS_EXTRA_OBJS@ +WINBIND_NSS_OBJ = $(WBCOMMON_OBJ) $(LIBREPLACE_OBJ) @WINBIND_NSS_EXTRA_OBJS@ LDB_COMMON_OBJ=lib/ldb/common/ldb.o lib/ldb/common/ldb_ldif.o \ lib/ldb/common/ldb_parse.o lib/ldb/common/ldb_msg.o lib/ldb/common/ldb_utf8.o \ @@ -967,7 +967,7 @@ LDBDEL_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbdel.o LDBMODIFY_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbmodify.o WINBIND_KRB5_LOCATOR_OBJ1 = nsswitch/winbind_krb5_locator.o -WINBIND_KRB5_LOCATOR_OBJ = $(WINBIND_KRB5_LOCATOR_OBJ1) $(WBCOMMON_OBJ) $(LIBREPLACE_OBJ) $(SOCKET_WRAPPER_OBJ) +WINBIND_KRB5_LOCATOR_OBJ = $(WINBIND_KRB5_LOCATOR_OBJ1) $(WBCOMMON_OBJ) $(LIBREPLACE_OBJ) POPT_OBJ=popt/findme.o popt/popt.o popt/poptconfig.o \ popt/popthelp.o popt/poptparse.o @@ -1397,9 +1397,9 @@ bin/ldbdel: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@ @LIBWBCLIENT_SHARED@ @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \ $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @WINBIND_LIBS@ -bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) nsswitch/wb_common.o $(LIBSAMBAUTIL_OBJ) +bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) @echo Linking shared library $@ - @$(SHLD_DSO) $(LIBWBCLIENT_OBJ) nsswitch/wb_common.o $(LIBSAMBAUTIL_OBJ) \ + @$(SHLD_DSO) $(LIBWBCLIENT_OBJ) \ @[EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_VER) @ln -s -f `basename [EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_VER) diff --git a/source/nsswitch/winbind_nss_config.h b/source/nsswitch/winbind_nss_config.h index 7f0e4b9..64d52af 100644 --- a/source/nsswitch/winbind_nss_config.h +++ b/source/nsswitch/winbind_nss_config.h @@ -27,6 +27,14 @@ #undef SIZEOF_LONG #endif +/* + * we don't need socket wrapper + * nor nss wrapper here and we don't + * want to depend on swrap_close() + * so we better disable both + */ +#define SOCKET_WRAPPER_NOT_REPLACE +#define NSS_WRAPPER_NOT_REPLACE /* Include header files from data in config.h file */ -- Samba Shared Repository