summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xpackaging/Debian/debian-sarge/rules2
-rwxr-xr-xpackaging/Debian/debian-unstable/rules2
-rwxr-xr-xpackaging/Debian/debian-woody/rules2
-rw-r--r--packaging/RHEL/samba.spec.tmpl2
-rw-r--r--packaging/RedHat-9/samba.spec.tmpl2
-rw-r--r--packaging/Solaris/makepkg.sh4
-rw-r--r--source3/Makefile.in4
-rw-r--r--source3/configure.in2
-rw-r--r--testsuite/nsswitch/pam_winbind_syms.exp2
9 files changed, 11 insertions, 11 deletions
diff --git a/packaging/Debian/debian-sarge/rules b/packaging/Debian/debian-sarge/rules
index 4db1aafd3a..eb6e71c90e 100755
--- a/packaging/Debian/debian-sarge/rules
+++ b/packaging/Debian/debian-sarge/rules
@@ -181,7 +181,7 @@ install: build
# Install winbind stuff not installed by 'make install'
install -m 0644 source/nsswitch/libnss_winbind.so \
$(DESTDIR)/lib/libnss_winbind.so.2
- install -m 0644 source/nsswitch/pam_winbind.so \
+ install -m 0644 source/bin/pam_winbind.so \
$(DESTDIR)/lib/security/
# Install libnss_wins.so, which is not installed by 'make install' either.
diff --git a/packaging/Debian/debian-unstable/rules b/packaging/Debian/debian-unstable/rules
index 71f833d4cb..bfc15255f3 100755
--- a/packaging/Debian/debian-unstable/rules
+++ b/packaging/Debian/debian-unstable/rules
@@ -176,7 +176,7 @@ install: build
# Install winbind stuff not installed by 'make install'
install -m 0644 source/nsswitch/libnss_winbind.so \
$(DESTDIR)/lib/libnss_winbind.so.2
- install -m 0644 source/nsswitch/pam_winbind.so \
+ install -m 0644 source/bin/pam_winbind.so \
$(DESTDIR)/lib/security/
# Install libnss_wins.so, which is not installed by 'make install' either.
diff --git a/packaging/Debian/debian-woody/rules b/packaging/Debian/debian-woody/rules
index f17ea75c01..d97dc99bce 100755
--- a/packaging/Debian/debian-woody/rules
+++ b/packaging/Debian/debian-woody/rules
@@ -147,7 +147,7 @@ install: build
# Install winbind stuff not installed by 'make install'
install -m 0644 source/nsswitch/libnss_winbind.so \
$(DESTDIR)/lib/libnss_winbind.so.2
- install -m 0644 source/nsswitch/pam_winbind.so \
+ install -m 0644 source/bin/pam_winbind.so \
$(DESTDIR)/lib/security/
# Install libnss_wins.so, which is not installed by 'make install' either.
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index f5302a87a7..6e5ebcb6d0 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -211,7 +211,7 @@ cd ..
cp source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass.so
# NSS & PAM winbind support
-install -m 755 source/nsswitch/pam_winbind.so $RPM_BUILD_ROOT/%{_lib}/security/pam_winbind.so
+install -m 755 source/bin/pam_winbind.so $RPM_BUILD_ROOT/%{_lib}/security/pam_winbind.so
install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_lib}/libnss_winbind.so
install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_lib}/libnss_wins.so
( cd $RPM_BUILD_ROOT/%{_lib};
diff --git a/packaging/RedHat-9/samba.spec.tmpl b/packaging/RedHat-9/samba.spec.tmpl
index 6ea456c384..e450bf512f 100644
--- a/packaging/RedHat-9/samba.spec.tmpl
+++ b/packaging/RedHat-9/samba.spec.tmpl
@@ -177,7 +177,7 @@ install -m755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/lib
# Install winbind shared libraries
install -m755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/lib
( cd $RPM_BUILD_ROOT/lib; ln -sf libnss_winbind.so libnss_winbind.so.2 )
-install -m755 source/nsswitch/pam_winbind.so $RPM_BUILD_ROOT/lib/security
+install -m755 source/bin/pam_winbind.so $RPM_BUILD_ROOT/lib/security
# Install pam_smbpass.so
install -m755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/lib/security
diff --git a/packaging/Solaris/makepkg.sh b/packaging/Solaris/makepkg.sh
index 18e9f00f84..6a8660b350 100644
--- a/packaging/Solaris/makepkg.sh
+++ b/packaging/Solaris/makepkg.sh
@@ -172,8 +172,8 @@ DOCDIR=$INSTALL_BASE/docs
##
cp -fp nsswitch/libnss_wins.so $TMPINSTALLDIR/$LIBDIR/nss_wins.so.1
cp -fp nsswitch/libnss_winbind.so $TMPINSTALLDIR/$LIBDIR/nss_winbind.so.1
-if [ -f nsswitch/pam_winbind.so ]; then
- cp -fp nsswitch/pam_winbind.so $TMPINSTALLDIR/$LIBDIR/pam_winbind.so
+if [ -f bin/pam_winbind.so ]; then
+ cp -fp bin/pam_winbind.so $TMPINSTALLDIR/$LIBDIR/pam_winbind.so
fi
if [ -f bin/smbwrapper.so ]; then
cp -fp bin/smbwrapper.so $TMPINSTALLDIR/$INSTALL_BASE/lib
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 02d17b010b..c178fbaa85 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -788,7 +788,7 @@ eventlogadm: SHOWFLAGS bin/eventlogadm@EXEEXT@
talloctort : SHOWFLAGS bin/talloctort@EXEEXT@
nsswitch : SHOWFLAGS bin/winbindd@EXEEXT@ bin/wbinfo@EXEEXT@ @WINBIND_NSS@ \
- @WINBIND_WINS_NSS@ nsswitch/pam_winbind.@SHLIBEXT@
+ @WINBIND_WINS_NSS@ bin/pam_winbind.@SHLIBEXT@
wins : SHOWFLAGS @WINBIND_WINS_NSS@
@@ -1196,7 +1196,7 @@ bin/winbindd@EXEEXT@: $(WINBINDD_OBJ) @BUILD_POPT@ bin/.dummy
$(LDAP_LIBS) $(KRB5LIBS) \
@SONAMEFLAG@`basename $@`@SONAMEVERSIONSUFFIX@
-nsswitch/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_PICOBJ) bin/.dummy
+bin/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_PICOBJ) bin/.dummy
@echo "Linking $@"
@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_PICOBJ) \
@SONAMEFLAG@`basename $@` $(LIBS) -lpam
diff --git a/source3/configure.in b/source3/configure.in
index 37acc0c7e4..fd1648010d 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -5107,7 +5107,7 @@ if test x"$HAVE_WINBIND" = x"yes"; then
SHLIB_PROGS="$SHLIB_PROGS $WINBIND_NSS $WINBIND_WINS_NSS"
if test x"$with_pam" = x"yes"; then
- SHLIB_PROGS="$SHLIB_PROGS nsswitch/pam_winbind.$SHLIBEXT"
+ SHLIB_PROGS="$SHLIB_PROGS bin/pam_winbind.$SHLIBEXT"
fi
fi
else
diff --git a/testsuite/nsswitch/pam_winbind_syms.exp b/testsuite/nsswitch/pam_winbind_syms.exp
index f95274cdd9..7c85a2d24d 100644
--- a/testsuite/nsswitch/pam_winbind_syms.exp
+++ b/testsuite/nsswitch/pam_winbind_syms.exp
@@ -29,7 +29,7 @@ if {$output != ""} {
# Run load-dl.c
set output [util_start "$srcdir/$subdir/pam_winbind_syms" \
- "nsswitch/pam_winbind.so"]
+ "bin/pam_winbind.so"]
if {[regexp "FAIL:" $output]} {
fail "run pam_winbind_syms"