summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--examples/redhat/Instructions3
-rwxr-xr-xexamples/redhat/makerpms.sh2
-rw-r--r--examples/redhat/samba.pamd3
-rw-r--r--examples/redhat/samba.spec15
4 files changed, 20 insertions, 3 deletions
diff --git a/examples/redhat/Instructions b/examples/redhat/Instructions
index c88f06e47d..60c79076ee 100644
--- a/examples/redhat/Instructions
+++ b/examples/redhat/Instructions
@@ -1,6 +1,5 @@
January 8, 1997
-
-John H Terpstra
+Copyright (C) John H Terpstra - 1997
Subject:
========
diff --git a/examples/redhat/makerpms.sh b/examples/redhat/makerpms.sh
index df54884a74..981dfa6a44 100755
--- a/examples/redhat/makerpms.sh
+++ b/examples/redhat/makerpms.sh
@@ -1,4 +1,6 @@
#!/bin/sh
+# Copyright (C) John H Terpstra and Erik Troan - 1997
+#
# First we move all our gear into place - a noble move!
RPMDIR=`rpm --showrc | awk '/^rpmdir/ { print $3}'`
SPECDIR=`rpm --showrc | awk '/^specdir/ { print $3}'`
diff --git a/examples/redhat/samba.pamd b/examples/redhat/samba.pamd
new file mode 100644
index 0000000000..34393a9600
--- /dev/null
+++ b/examples/redhat/samba.pamd
@@ -0,0 +1,3 @@
+auth required /lib/security/pam_unix_auth.so
+auth required /lib/security/pam_pwd.so nullok shadow
+account required /lib/security/pam_unix_account.so
diff --git a/examples/redhat/samba.spec b/examples/redhat/samba.spec
index ee427e0509..f019f5fbc5 100644
--- a/examples/redhat/samba.spec
+++ b/examples/redhat/samba.spec
@@ -100,7 +100,11 @@ install -m 644 examples/redhat/samba.log $RPM_BUILD_ROOT/etc/logrotate.d/samba
rm -rf $RPM_BUILD_ROOT
%post
+if [ -d /etc/pam.d ]; then
+install -m 644 examples/redhat/samba.pamd $RPM_BUILD_ROOT/etc/pam.d/samba
+else
/sbin/pamconfig --add --service=samba --password=none --sesslist=none
+fi
if [ ! -f /var/log/samba ]; then
touch /var/log/samba
@@ -109,7 +113,13 @@ fi
%postun
if [ "$1" = 0 ] ; then
- /sbin/pamconfig --remove --service=samba --password=none --sesslist=none
+ if [ -x /etc/pam.d/samba ]; then
+ rm -f /etc/pam.d/samba
+ else
+ if [ -x /etc/pam.conf ]; then
+ /sbin/pamconfig --remove --service=samba --password=none --sesslist=none
+ fi
+ fi
fi
%files
@@ -141,6 +151,9 @@ fi
%attr(-,root,root) %config /etc/rc.d/rc6.d/K35smb
%attr(-,root,root) %config /etc/rc.d/rc2.d/K35smb
%attr(-,root,root) %config /etc/logrotate.d/samba
+if [ -x /etc/pam.d/samba ]; then
+ %attr(-,root,root) %config /etc/pam.d/samba
+fi
%attr(-,root,root) /usr/man/man1/smbstatus.1
%attr(-,root,root) /usr/man/man1/smbclient.1
%attr(-,root,root) /usr/man/man1/smbrun.1