From: Günther Deschner Date: Wed, 30 Apr 2008 16:23:26 +0000 (+0200) Subject: pam_winbind: Fix Bug #5430 (patch from fumiyas@osstech.co.jp). X-Git-Tag: samba-4.0.0alpha6~801^2~1548 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb623c942d2b9dd3b9a47ee62593fd04805411d3;p=thirdparty%2Fsamba.git pam_winbind: Fix Bug #5430 (patch from fumiyas@osstech.co.jp). Guenther (This used to be commit d8372f73b93d3f323310f5456fef204884c303bb) --- diff --git a/source3/Makefile.in b/source3/Makefile.in index cbe36fcb491..3ad631589f3 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -1778,7 +1778,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/source3/configure.in b/source3/configure.in index 03c8cce4500..a07b5b4aacd 100644 --- a/source3/configure.in +++ b/source3/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)