sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

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

Browse Source 
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 9883957b74)
This commit is contained in:
Lars Müller
2006-03-13 14:22:43 +00:00
committed by Gerald (Jerry) Carter
parent d72bb5627c
commit b372fd2cff
9 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/Debian/debian-sarge/rules
View File

@ -181,7 +181,7 @@ install: build
# Install winbind stuff not installed by 'make install' # Install winbind stuff not installed by 'make install'
install -m 0644 source/nsswitch/libnss_winbind.so \ install -m 0644 source/nsswitch/libnss_winbind.so \
$(DESTDIR)/lib/libnss_winbind.so.2 $(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/ $(DESTDIR)/lib/security/
# Install libnss_wins.so, which is not installed by 'make install' either. # Install libnss_wins.so, which is not installed by 'make install' either.

2
packaging/Debian/debian-unstable/rules
View File

@ -176,7 +176,7 @@ install: build
# Install winbind stuff not installed by 'make install' # Install winbind stuff not installed by 'make install'
install -m 0644 source/nsswitch/libnss_winbind.so \ install -m 0644 source/nsswitch/libnss_winbind.so \
$(DESTDIR)/lib/libnss_winbind.so.2 $(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/ $(DESTDIR)/lib/security/
# Install libnss_wins.so, which is not installed by 'make install' either. # Install libnss_wins.so, which is not installed by 'make install' either.

2
packaging/Debian/debian-woody/rules
View File

@ -147,7 +147,7 @@ install: build
# Install winbind stuff not installed by 'make install' # Install winbind stuff not installed by 'make install'
install -m 0644 source/nsswitch/libnss_winbind.so \ install -m 0644 source/nsswitch/libnss_winbind.so \
$(DESTDIR)/lib/libnss_winbind.so.2 $(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/ $(DESTDIR)/lib/security/
# Install libnss_wins.so, which is not installed by 'make install' either. # Install libnss_wins.so, which is not installed by 'make install' either.

2
packaging/RHEL/samba.spec.tmpl
View File

@ -211,7 +211,7 @@ cd ..
cp source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass.so cp source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass.so
# NSS & PAM winbind support # 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_winbind.so $RPM_BUILD_ROOT/%{_lib}/libnss_winbind.so
install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_lib}/libnss_wins.so install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_lib}/libnss_wins.so
( cd $RPM_BUILD_ROOT/%{_lib}; ( cd $RPM_BUILD_ROOT/%{_lib};

2
packaging/RedHat-9/samba.spec.tmpl
View File

@ -177,7 +177,7 @@ install -m755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/lib
# Install winbind shared libraries # Install winbind shared libraries
install -m755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/lib 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 ) ( 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 pam_smbpass.so
install -m755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/lib/security install -m755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/lib/security

4
packaging/Solaris/makepkg.sh
View File

@ -172,8 +172,8 @@ DOCDIR=$INSTALL_BASE/docs
## ##
cp -fp nsswitch/libnss_wins.so $TMPINSTALLDIR/$LIBDIR/nss_wins.so.1 cp -fp nsswitch/libnss_wins.so $TMPINSTALLDIR/$LIBDIR/nss_wins.so.1
cp -fp nsswitch/libnss_winbind.so $TMPINSTALLDIR/$LIBDIR/nss_winbind.so.1 cp -fp nsswitch/libnss_winbind.so $TMPINSTALLDIR/$LIBDIR/nss_winbind.so.1
if [ -f nsswitch/pam_winbind.so ]; then if [ -f bin/pam_winbind.so ]; then
cp -fp nsswitch/pam_winbind.so $TMPINSTALLDIR/$LIBDIR/pam_winbind.so cp -fp bin/pam_winbind.so $TMPINSTALLDIR/$LIBDIR/pam_winbind.so
fi fi
if [ -f bin/smbwrapper.so ]; then if [ -f bin/smbwrapper.so ]; then
cp -fp bin/smbwrapper.so $TMPINSTALLDIR/$INSTALL_BASE/lib cp -fp bin/smbwrapper.so $TMPINSTALLDIR/$INSTALL_BASE/lib

4
source3/Makefile.in
View File

@ -788,7 +788,7 @@ eventlogadm: SHOWFLAGS bin/eventlogadm@EXEEXT@
talloctort : SHOWFLAGS bin/talloctort@EXEEXT@ talloctort : SHOWFLAGS bin/talloctort@EXEEXT@
nsswitch : SHOWFLAGS bin/winbindd@EXEEXT@ bin/wbinfo@EXEEXT@ @WINBIND_NSS@ \ 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@ wins : SHOWFLAGS @WINBIND_WINS_NSS@
@ -1196,7 +1196,7 @@ bin/winbindd@EXEEXT@: $(WINBINDD_OBJ) @BUILD_POPT@ bin/.dummy
$(LDAP_LIBS) $(KRB5LIBS) \ $(LDAP_LIBS) $(KRB5LIBS) \
@SONAMEFLAG@`basename $@`@SONAMEVERSIONSUFFIX@ @SONAMEFLAG@`basename $@`@SONAMEVERSIONSUFFIX@
nsswitch/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_PICOBJ) bin/.dummy bin/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_PICOBJ) bin/.dummy
@echo "Linking $@" @echo "Linking $@"
@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_PICOBJ) \ @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_PICOBJ) \
@SONAMEFLAG@`basename $@` $(LIBS) -lpam @SONAMEFLAG@`basename $@` $(LIBS) -lpam

2
source3/configure.in
View File

@ -5107,7 +5107,7 @@ if test x"$HAVE_WINBIND" = x"yes"; then
SHLIB_PROGS="$SHLIB_PROGS $WINBIND_NSS $WINBIND_WINS_NSS" SHLIB_PROGS="$SHLIB_PROGS $WINBIND_NSS $WINBIND_WINS_NSS"
if test x"$with_pam" = x"yes"; then 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
fi fi
else else

2
testsuite/nsswitch/pam_winbind_syms.exp
View File

@ -29,7 +29,7 @@ if {$output != ""} {
# Run load-dl.c # Run load-dl.c
set output [util_start "$srcdir/$subdir/pam_winbind_syms" \ set output [util_start "$srcdir/$subdir/pam_winbind_syms" \
"nsswitch/pam_winbind.so"] "bin/pam_winbind.so"]
if {[regexp "FAIL:" $output]} { if {[regexp "FAIL:" $output]} {
fail "run pam_winbind_syms" fail "run pam_winbind_syms"