r14317: Use source/bin as dir to link pam_winbind instead of source/nsswitch/

The intention is to have the resulting binaries at one place.  This is
also usefull for upcoming changes to provide a test_pammodules rule.

With these changes I even got aware of
testsuite/nsswitch/pam_winbind_syms.exp  But this only covers
pam_winbind.
(This used to be commit 9883957b74ddefb5293e4aef0cc2f53ee4d417ac)

diff --git a/packaging/Debian/debian-sarge/rules b/packaging/Debian/debian-sarge/rules
index 4db1aafd3aca04adedb8ef0ff3762d2ca19ee4a3..eb6e71c90e12ca636d7267ca6b16e052228fa65e 100755 (executable)
--- 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 71f833d4cb205098b59e7e3e948966d2d40bb822..bfc15255f33879252e200d8b698c992521b6882d 100755 (executable)
--- 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 f17ea75c0157329579c1fbd60dc99595d03f77c8..d97dc99bce87cc77780f55f90036f9d8c57a87de 100755 (executable)
--- 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 f5302a87a724528ec3e2e5f007ab53c3e02f920d..6e5ebcb6d0bfdb3bb2fc2bb26e528f91b4bea883 100644 (file)
--- 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 6ea456c3841f86f3024abdf812273cea43b9815f..e450bf512fb2a9ca8499d9840368a9a15b55d1d8 100644 (file)
--- 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 18e9f00f84ae8088a74189a22050cc3c09639bf7..6a8660b350c5f7ea115f8cc3379bf2fb95e873f4 100644 (file)
--- 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 02d17b010b8861f61ba63dae2c338733e11951dd..c178fbaa85807cbf18f756fd78ba3e9895704ee9 100644 (file)
--- 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 37acc0c7e45f90ca584a245e506f6d022ce53148..fd1648010d0a36fc0e09f63d0f06b1ce30b3ae61 100644 (file)
--- 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 f95274cdd9df298859cefaab6746106ae658df7e..7c85a2d24d373911fef448dbbf6143be58f6ea44 100644 (file)
--- 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"