[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2267-g06f33d3

[Günther Deschner]

The branch, v3-2-test has been updated
       via  06f33d3725e0d82568c4a3278f59892e3e57a8ee (commit)
      from  612e7cdff3139ff3b2cfaf4b213cb47ce75983d1 (commit)

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


- Log -----------------------------------------------------------------
commit 06f33d3725e0d82568c4a3278f59892e3e57a8ee
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 30 18:23:26 2008 +0200

    pam_winbind: Fix Bug #5430 (patch from fumiyas at osstech.co.jp).
    
    Guenther
    (cherry picked from commit 5b65df6245c1458ca21cc602df11c49aa97a25c5)

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

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


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index e0ebc4f..9bbacad 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1768,7 +1768,7 @@ bin/winbind_krb5_locator. at SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OB
 bin/pam_winbind. at SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ)
 	@echo "Linking shared library $@"
 	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) -lpam @INIPARSERLIBS@ \
-		@SONAMEFLAG@`basename $@`
+		@PAM_WINBIND_EXTRA_LIBS@ @SONAMEFLAG@`basename $@`
 
 bin/builtin. at SHLIBEXT@: $(BINARY_PREREQS) $(AUTH_BUILTIN_OBJ)
 	@echo "Building plugin $@"
diff --git a/source/configure.in b/source/configure.in
index 03c8cce..a07b5b4 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -5729,6 +5729,7 @@ case "$host_os" in
 		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_solaris.o \
 		    nsswitch/winbind_nss_linux.o"
 		WINBIND_NSS_EXTRA_LIBS="-lsocket"
+		PAM_WINBIND_EXTRA_LIBS="-lsocket"
 		;;
 	*hpux11*)
 		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_solaris.o"
@@ -5823,6 +5824,7 @@ AC_SUBST(WINBIND_NSS_LDSHFLAGS)
 AC_SUBST(WINBIND_NSS_EXTRA_OBJS)
 AC_SUBST(WINBIND_NSS_EXTRA_LIBS)
 AC_SUBST(NSSSONAMEVERSIONSUFFIX)
+AC_SUBST(PAM_WINBIND_EXTRA_LIBS)
 
 AC_SUBST(WINBIND_KRB5_LOCATOR)
 


-- 
Samba Shared Repository