summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-09-08 15:51:33 +0200
committerMichael Adam <obnox@samba.org>2008-09-09 10:53:27 +0200
commitd2732bf628fd8d94ae8625d573d278376580cf38 (patch)
tree29e6e1673acbafcec24adfeb355672f5750dbd3e
parenta289a65140787b09c6479cee8f31e4b614209e96 (diff)
downloadsamba-d2732bf628fd8d94ae8625d573d278376580cf38.tar.gz
samba-d2732bf628fd8d94ae8625d573d278376580cf38.tar.bz2
samba-d2732bf628fd8d94ae8625d573d278376580cf38.zip
packaging(RHEL): fix installation of pam modules.
Michael (This used to be commit 0f045f18ebaa752b9d906afc64fd5badb3bf352c)
-rw-r--r--packaging/RHEL/samba.spec.tmpl7
1 files changed, 2 insertions, 5 deletions
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index 55275d18ce..ec811af1bb 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -138,6 +138,7 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
--with-configdir=%{_sysconfdir}/samba \
--libdir=%{_libarchdir} \
--with-modulesdir=%{_libarchdir}/samba \
+ --with-pammodulesdir=%{_libarch}/security \
--with-lockdir=/var/lib/samba \
--with-logfilebase=/var/log/samba \
--with-mandir=%{_mandir} \
@@ -215,17 +216,13 @@ make DESTDIR=$RPM_BUILD_ROOT \
install
cd ..
-# NSS & PAM winbind support
-install -m 755 source/bin/pam_winbind.so $RPM_BUILD_ROOT/%{_libarch}/security/pam_winbind.so
+# NSS winbind support
install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/libnss_winbind.so
install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so
( cd $RPM_BUILD_ROOT/%{_libarch};
ln -sf libnss_winbind.so libnss_winbind.so.2;
ln -sf libnss_wins.so libnss_wins.so.2 )
-# Install pam_smbpass.so
-install -m755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_libarch}/security/pam_smbpass.so
-
## cleanup
/bin/rm -rf $RPM_BUILD_ROOT/usr/lib*/samba/security