summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2003-12-15 16:42:42 +0000
committerGerald Carter <jerry@samba.org>2003-12-15 16:42:42 +0000
commit5121bd6edeaecc6e39e17257bfa54358f5b9f468 (patch)
tree42f81865408d64cad01d50582e8f2fae63cc5f30
parentc13109358d2c47e144d6d2845d5299f072c08da7 (diff)
downloadsamba-5121bd6edeaecc6e39e17257bfa54358f5b9f468.tar.gz
samba-5121bd6edeaecc6e39e17257bfa54358f5b9f468.tar.xz
samba-5121bd6edeaecc6e39e17257bfa54358f5b9f468.zip
correct problem with pam config install
(This used to be commit c368defc05f80c255ceb51229ea7a2ef16ee6aee)
-rw-r--r--packaging/RedHat/samba.spec.tmpl17
1 files changed, 7 insertions, 10 deletions
diff --git a/packaging/RedHat/samba.spec.tmpl b/packaging/RedHat/samba.spec.tmpl
index 1ada371d0d8..7ef87da29bb 100644
--- a/packaging/RedHat/samba.spec.tmpl
+++ b/packaging/RedHat/samba.spec.tmpl
@@ -285,16 +285,13 @@ else
rm -f /etc/samba/samba.xinetd
fi
-# Install the correct version of the samba pam file, depending on pam version.
-# (always keep an existing PAM config file)
-if [ ! -f /lib/security/pam_stack.so ]; then
- if [ -f /lib/security/pam_stack.so ]; then
- echo "Installing stack version of /etc/pam.d/samba..."
- mv /etc/samba/samba.stack /etc/pam.d/samba
- else
- echo "Installing non-stack version of /etc/pam.d/samba..."
- rm -f /etc/samba/samba.stack
- fi
+# Install the correct version of the samba pam file
+if [ -f /lib/security/pam_stack.so ]; then
+ echo "Installing stack version of /etc/pam.d/samba..."
+ mv /etc/samba/samba.stack /etc/pam.d/samba
+else
+ echo "Installing non-stack version of /etc/pam.d/samba..."
+ rm -f /etc/samba/samba.stack
fi
## call ldconfig to create the version symlink for libsmbclient.so