[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1241-g5839491

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  5839491d9d9e270e807048a4a505ce42bd99ea18 (commit)
       via  b9c07dd26d5177d25b4e136b790ee279aeb63887 (commit)
      from  f97a1a0d3b708872534c85dbc5ae53215577057c (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit 5839491d9d9e270e807048a4a505ce42bd99ea18
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Jul 15 17:24:14 2009 +0200

    s3: make linking of rpcclient --as-needed safe
    
    Second part of a fix for bug #6105.
    
    (cherry picked from commit 5236b3699da2b5cc55d55310de76e4ab65a8bb46)

commit b9c07dd26d5177d25b4e136b790ee279aeb63887
Author: Peter Volkov <pva at gentoo.org>
Date:   Wed Jul 15 17:36:25 2009 +0200

    s3: make linking of cifs.upcall --as-needed safe
    
    Part of a fix for bug #6105.
    
    See http://www.gentoo.org/proj/en/qa/asneeded.xml for details.
    (cherry picked from commit 2df4550aae1e326511fe4e7e0d2d98be3e578caf)

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

Summary of changes:
 source3/Makefile.in |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 4001eda..6ac9571 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1427,10 +1427,10 @@ bin/swat at EXEEXT@: $(BINARY_PREREQS) $(SWAT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@
 
 bin/rpcclient at EXEEXT@: $(BINARY_PREREQS) $(RPCCLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@
 	@echo Linking $@
-	@$(CC) -o $@ $(LDFLAGS) $(PASSDB_LIBS) $(RPCCLIENT_OBJ) \
+	@$(CC) -o $@ $(LDFLAGS) $(RPCCLIENT_OBJ) \
 		$(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \
 		$(KRB5LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
-		$(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
+		$(LIBWBCLIENT_LIBS) $(ZLIB_LIBS) $(PASSDB_LIBS)
 
 bin/smbclient at EXEEXT@: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@
 	@echo Linking $@
@@ -1468,7 +1468,7 @@ bin/umount.cifs at EXEEXT@: $(BINARY_PREREQS) $(CIFS_UMOUNT_OBJ)
 bin/cifs.upcall at EXEEXT@: $(BINARY_PREREQS) $(CIFS_UPCALL_OBJ) $(LIBSMBCLIENT_OBJ1) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@
 	@echo Linking $@
 	@$(CC) -o $@ $(CIFS_UPCALL_OBJ) $(DYNEXP) $(LDFLAGS) \
-		-lkeyutils $(LIBS) $(LIBSMBCLIENT_OBJ1) $(KRB5LIBS) \
+		$(LIBSMBCLIENT_OBJ1) $(LIBS) -lkeyutils $(KRB5LIBS) \
 		$(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) \
 		$(LIBTDB_LIBS) $(NSCD_LIBS)
 


-- 
Samba Shared Repository