summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorJohn Terpstra <jht@samba.org>2002-03-12 06:52:35 +0000
committerJohn Terpstra <jht@samba.org>2002-03-12 06:52:35 +0000
commitcbad04053fc24ac55dd5626659a5fd263a0b16f4 (patch)
tree6be88136b831537530c19d89ca5dee3a39518ac3 /packaging
parent89d998547d6e12e17b0a4fd97dc92c4199bca866 (diff)
downloadsamba-cbad04053fc24ac55dd5626659a5fd263a0b16f4.tar.gz
samba-cbad04053fc24ac55dd5626659a5fd263a0b16f4.tar.bz2
samba-cbad04053fc24ac55dd5626659a5fd263a0b16f4.zip
Update samba.pam from 2.2.4pre branch.
Fixups for incorrect man page location by installman.sh - Note: FHS standard for man pages if /usr/share/man/XX where XX is the language mneumonic (This used to be commit e3e0a5aca9593f18e5f218b54641048cd823ac03)
Diffstat (limited to 'packaging')
-rw-r--r--packaging/Caldera/OpenLinux/samba.pam50
-rw-r--r--packaging/Caldera/OpenLinux/samba3.spec.tmpl20
2 files changed, 49 insertions, 21 deletions
diff --git a/packaging/Caldera/OpenLinux/samba.pam b/packaging/Caldera/OpenLinux/samba.pam
index 225ab724ec..821c9046a6 100644
--- a/packaging/Caldera/OpenLinux/samba.pam
+++ b/packaging/Caldera/OpenLinux/samba.pam
@@ -3,9 +3,47 @@
#
# The PAM configuration file for the `samba' service
#
-auth required /lib/security/pam_pwdb.so nullok nodelay # shadow audit
-# auth required /lib/security/pam_smbpass.so nodelay
-account required /lib/security/pam_pwdb.so audit nodelay
-session required /lib/security/pam_pwdb.so nodelay
-password required /lib/security/pam_pwdb.so # shadow md5
-#password required /lib/security/pam_smbpass.so nodelay smbconf=/etc/samba.d/smb.conf
+# Note: Only one section should be active at a time.
+# Uncomment only those features needed. The default is a minimal implementation.
+#
+# --------------------------------------------------------------------------------
+# This example uses the standard System Files (/etc/passwd,/etc/shadow,/etc/group)
+# and uses a very vanila PAM configuration
+#
+# auth requisite pam_securetty.so
+# auth requisite pam_nologin.so
+# auth optional pam_env.so
+auth required pam_pwdb.so nullok nodelay # audit
+account required pam_pwdb.so nodelay # audit
+# session required pam_mkhomedir.so
+session required pam_pwdb.so nodelay
+password required pam_pwdb.so nodelay # shadow md5 audit
+#
+# --------------------------------------------------------------------------------
+# This example uses PAM smbpass
+#
+# auth requisite pam_securetty.so
+# auth requisite pam_nologin.so
+# auth optional pam_env.so
+# auth required pam_smbpass.so nodelay
+# account required pam_pwdb.so nodelay # audit
+# account sufficient pam_winbind.so
+# session required pam_mkhomedir.so
+# session required pam_pwdb.so nodelay
+# password required pam_pwdb.so shadow md5
+# password required pam_smbpass.so nodelay smbconf=/etc/samba.d/smb.conf
+#
+# --------------------------------------------------------------------------------
+# This example uses PAM WinBind
+#
+# auth requisite pam_securetty.so
+# auth requisite pam_nologin.so
+# auth optional pam_env.so
+# auth sufficient pam_winbind.so
+# auth sufficient pam_pwdb.so shadow nullok use_first_pass
+# account required pam_pwdb.so nodelay # audit
+# account sufficient pam_winbind.so
+# session required pam_mkhomedir.so
+# session required pam_pwdb.so nodelay
+# password required pam_pwdb.so shadow md5
+#
diff --git a/packaging/Caldera/OpenLinux/samba3.spec.tmpl b/packaging/Caldera/OpenLinux/samba3.spec.tmpl
index d041b1470b..730c6bdff6 100644
--- a/packaging/Caldera/OpenLinux/samba3.spec.tmpl
+++ b/packaging/Caldera/OpenLinux/samba3.spec.tmpl
@@ -296,26 +296,12 @@ cp -p $VVS/samba.init $DESTDIR/etc/rc.d/init.d/samba
ln -s /etc/rc.d/init.d/samba $DESTDIR/usr/sbin
cp -p $VVS/smb.conf.sample $DESTDIR%{EtcSamba}/smb.conf.sample
-#cp -p $VVS/smb.conf.sample $DESTDIR%{EtcSamba}/smb.conf
cp -p $VVS/smbusers $DESTDIR%{EtcSamba}
-#cp -p $VVS/smbprint $DESTDIR/usr/bin
-#cp -p $VVS/smbadduser.perl $DESTDIR/usr/sbin/smbadduser
-#cp -p $VVS/make_smbpasswd.perl $DESTDIR/usr/sbin/make_smbpasswd
-#cp -p $VVS/convertsmbpasswd.perl $DESTDIR/usr/sbin/convertsmbpasswd
-#cp -p $VVS/updatesmbpasswd.perl $DESTDIR/usr/sbin/updatesmbpasswd
cp -p $VVS/findsmb $DESTDIR/usr/sbin
cp -p $VVS/samba.daemon $DESTDIR/etc/sysconfig/daemons/samba
cp -p $VVS/samba.pam $DESTDIR/etc/pam.d/samba
cp -p $VVS/samba.logrotate $DESTDIR/etc/logrotate.d/samba
-#for f in testparm testprns; do
-# ln -s $f $DESTDIR/usr/bin/smb$f
-# ln -s $f.1 $DESTDIR/usr/man/man1/smb$f.1
-#done
-#ln -s make_smbcodepage $DESTDIR/usr/sbin/mksmbcodepage
-#ln -s make_smbpasswd $DESTDIR/usr/sbin/mksmbpasswd
-#ln -sf convert_smbpasswd $DESTDIR/usr/sbin/convertsmbpasswd
-
cat <<-'EoH' > $DESTDIR%{EtcSamba}/lmhosts
127.0.0.1 localhost
EoH
@@ -363,6 +349,10 @@ done
%{fixUP} -vT $DESTDIR/%{EtcSamba} -e 's:\@samba_home\@:%{LSBservedir}:'
%{fixManPages}
+cd $DESTDIR/usr/share/man/lang
+cp -a . $DESTDIR/usr/share/man/en
+cd ..
+rm -rf lang
%{mkLists} -c samba
cat << 'EOF' | %{mkLists} -d samba
@@ -391,7 +381,7 @@ pam_* base
smb(mount|mnt|umount) smbfs
mount.smbfs smbfs
swat swat
-libsmbclient* libsmbclient
+libsmbclient libsmbclient
@default@
EOF