The branch, v3-4-test has been updated
via c0cbfde... s3/Makefile: BUG 6791: Fix link order for libwbclient.
via 7aea6ad... s3/Makefile: BUG 6791: Fix linking order in cifs.upcall.
from 37f42ad... Correct fix for bug 6781 - Cannot rename subfolders in
Explorer view with recent versions of Samba. Without this fix, renaming a
directory ./a to ./b, whilst a directory ./aa was already open would fail.
Simplifies logic of earlier code. Jeremy.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -----------------------------------------------------------------
commit c0cbfdef387bf70e589dec6a3bbd434d12cacc34
Author: Karolin Seeger <[email protected]>
Date: Fri Oct 9 08:58:55 2009 +0200
s3/Makefile: BUG 6791: Fix link order for libwbclient.
Patch was provided by Buchan Milne <[email protected]>.
Signed-off-by: Björn Jacke <[email protected]>
commit 7aea6adcede87a2389d933eedc50f836ba161f95
Author: Karolin Seeger <[email protected]>
Date: Fri Oct 9 08:55:53 2009 +0200
s3/Makefile: BUG 6791: Fix linking order in cifs.upcall.
Patch was originally provided by Buchan Milne <[email protected]>.
Signed-off-by: Björn Jacke <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source3/Makefile.in | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 6ac9571..97b86fc 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1470,7 +1470,7 @@ bin/cifs.upc...@exeext@: $(BINARY_PREREQS)
$(CIFS_UPCALL_OBJ) $(LIBSMBCLIENT_OBJ
@$(CC) -o $@ $(CIFS_UPCALL_OBJ) $(DYNEXP) $(LDFLAGS) \
$(LIBSMBCLIENT_OBJ1) $(LIBS) -lkeyutils $(KRB5LIBS) \
$(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) \
- $(LIBTDB_LIBS) $(NSCD_LIBS)
+ $(LIBTDB_LIBS) $(NSCD_LIBS) $(ZLIB_LIBS)
bin/testp...@exeext@: $(BINARY_PREREQS) $(TESTPARM_OBJ) @BUILD_POPT@
@LIBTALLOC_TARGET@ @LIBTDB_TARGET@
@echo Linking $@
@@ -1872,7 +1872,7 @@ $(LIBWBCLIENT_SYMS): $(LIBWBCLIENT_HEADERS)
$(LIBWBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ)
$(LIBWBCLIENT_SYMS) @LIBTALLOC_TARGET@
@echo Linking shared library $@
- @$(SHLD_DSO) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_OBJ) \
+ @$(SHLD_DSO) $(LIBWBCLIENT_OBJ) $(LIBTALLOC_LIBS) \
@sonamef...@`basename $...@`
$(LIBWBCLIENT_SHARED_TARGET): $(LIBWBCLIENT_SHARED_TARGET_SONAME)
@@ -2050,7 +2050,7 @@ $(LIBNETAPI_SHARED_TARGET_SONAME): $(BINARY_PREREQS)
$(LIBNETAPI_OBJ) $(LIBNETAP
@echo Linking shared library $@
@$(SHLD_DSO) $(LIBNETAPI_OBJ) \
$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(LIBS) \
- $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \
+ $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) $(ZLIB_LIBS) \
@sonamef...@`basename $...@`
$(LIBNETAPI_SHARED_TARGET): $(LIBNETAPI_SHARED_TARGET_SONAME)
@@ -2386,7 +2386,7 @@ bin/v...@exeext@: $(BINARY_PREREQS) $(VLP_OBJ)
@LIBTALLOC_TARGET@ @LIBTDB_TARGET@
@echo "Linking $@"
@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ) \
$(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS)
$(LIBTDB_LIBS) \
- @sonamef...@`basename $...@`@NSSSONAMEVERSIONSUFFIX@
+ $(ZLIB_LIBS) @sonamef...@`basename
$...@`@NSSSONAMEVERSIONSUFFIX@
bin/winbind_krb5_locat...@shlibext@: $(BINARY_PREREQS)
$(WINBIND_KRB5_LOCATOR_OBJ) @LIBWBCLIENT_TARGET@
@echo "Linking $@"
--
Samba Shared Repository
