pam_winbind: Fix Bug #5430 (patch from fumiyas@osstech.co.jp).

Guenther
(cherry picked from commit 5b65df6245c1458ca21cc602df11c49aa97a25c5)

diff --git a/source/Makefile.in b/source/Makefile.in
index e0ebc4ff758e69f847e10af79c350a27c87f462c..9bbacad81a88a412ef0a496c93cdca199c4afd1e 100644 (file)
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1768,7 +1768,7 @@ bin/winbind_krb5_locator.@SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OB
 bin/pam_winbind.@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.@SHLIBEXT@: $(BINARY_PREREQS) $(AUTH_BUILTIN_OBJ)
        @echo "Building plugin $@"

diff --git a/source/configure.in b/source/configure.in
index 03c8cce4500995ccaf5026ec924c7c467f80ddff..a07b5b4aacddad6328f2ee6ceb698bfdeb34efa7 100644 (file)
--- 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)