summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Andreetta <satya@gentoo.org>2005-06-10 13:10:05 +0000
committerChristian Andreetta <satya@gentoo.org>2005-06-10 13:10:05 +0000
commit84105a952301d2feceb805d29b9c35b41e1080c7 (patch)
treec16bbfec900467ca9b547e989d879eb55fc47238 /net-fs/samba
parentAdded to ~ppc (diff)
downloadhistorical-84105a952301d2feceb805d29b9c35b41e1080c7.tar.gz
historical-84105a952301d2feceb805d29b9c35b41e1080c7.tar.bz2
historical-84105a952301d2feceb805d29b9c35b41e1080c7.zip
reverting pam to old behaviour until pam-0.78 becomes stable
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'net-fs/samba')
-rw-r--r--net-fs/samba/ChangeLog5
-rw-r--r--net-fs/samba/Manifest26
-rw-r--r--net-fs/samba/files/samba.pam8
3 files changed, 22 insertions, 17 deletions
diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 33304a0edafd..71f342d95dc2 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-fs/samba
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.176 2005/06/09 19:27:05 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.177 2005/06/10 13:10:05 satya Exp $
+
+ 10 Jun 2005; Christian Andreetta <satya@gentoo.org> files/samba.pam:
+ reverting pam to old behaviour until pam-0.78 becomes stable
09 Jun 2005; Markus Rothe <corsair@gentoo.org> samba-3.0.14a-r1.ebuild:
Stable on ppc64
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 3099c27f926d..6a555a23e946 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,25 +1,25 @@
-MD5 1f7ccea6f9de758ce72967a0e039a38f ChangeLog 31542
-MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
-MD5 dba6533a0f625f4ae8e69e5f3c0cd181 samba-3.0.10.ebuild 16541
MD5 82365d515a7f7b7f5811220f6dadeaa9 samba-3.0.11.ebuild 8774
+MD5 dba6533a0f625f4ae8e69e5f3c0cd181 samba-3.0.10.ebuild 16541
MD5 5a4f63200d2d458dd0dc682981b4ae6b samba-3.0.14a-r1.ebuild 8776
+MD5 548b928d6bb96230bd21906a13bade05 ChangeLog 31675
+MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
MD5 fa1dcd2c95a81c22c2ad68de6698a85e files/digest-samba-3.0.10 206
MD5 498babc5e33f61369f42201f25eb35c0 files/digest-samba-3.0.11 215
-MD5 3cff882704d5ba84a75a76fc4262b3d3 files/digest-samba-3.0.14a-r1 216
-MD5 519576a9448b86f1a7baab18204533a5 files/lmhosts 126
-MD5 12df1953c039c5a93939497b0bc0ffba files/nsswitch.conf-winbind 403
-MD5 7ee5edc70bf80888c776f5808f865996 files/nsswitch.conf-wins 392
-MD5 0c0364e7f0bc4cc48d8f9b103e606a93 files/samba-2.2.8-statfs.patch 239
+MD5 e89b19f1e62e257cbaa23a44a0362a58 files/swat.xinetd 527
MD5 def157a63ec14450df82373617c7dc4b files/samba-3.0.11-gcc4.patch 485
+MD5 e17a1638ad9f30f2e39db4c8981a2fcd files/vscan-0.3.5-libclamav.patch 523
+MD5 7ee5edc70bf80888c776f5808f865996 files/nsswitch.conf-wins 392
+MD5 341521b710d02d57a70acd49b1d4c06b files/samba-conf 1291
+MD5 a1bbdaf99b7a3819a219a9450fa3dd0a files/samba-init 1104
MD5 b836e258befae9d6c66cb3f158769b25 files/samba-3.0.x-libdirsymlink.patch 592
+MD5 12df1953c039c5a93939497b0bc0ffba files/nsswitch.conf-winbind 403
+MD5 519576a9448b86f1a7baab18204533a5 files/lmhosts 126
MD5 e75c2316eced1d80cb2161848581c6a3 files/samba-3.0.x-python-setup.patch 1094
+MD5 3cff882704d5ba84a75a76fc4262b3d3 files/digest-samba-3.0.14a-r1 216
+MD5 0c0364e7f0bc4cc48d8f9b103e606a93 files/samba-2.2.8-statfs.patch 239
MD5 8ea7b443dd580aaaaf7e9e896eba54f2 files/samba-3.0.x-smbumount-uid32.patch 425
-MD5 341521b710d02d57a70acd49b1d4c06b files/samba-conf 1291
-MD5 a1bbdaf99b7a3819a219a9450fa3dd0a files/samba-init 1104
-MD5 583143dc547e56092963aafef6c4c9ce files/samba.pam 369
MD5 bf268fdddc8ef677b6fa78661a094eac files/samba.schema 16044
MD5 239ef0e21552896faeef21c685561245 files/smb.conf.example-samba3.gz 7808
MD5 3685eadb817d185b06476eca6c0c15c4 files/smbusers 204
-MD5 e89b19f1e62e257cbaa23a44a0362a58 files/swat.xinetd 527
MD5 09195dd8ab25ce77ac51c0c05b4ab93c files/system-auth-winbind 869
-MD5 e17a1638ad9f30f2e39db4c8981a2fcd files/vscan-0.3.5-libclamav.patch 523
+MD5 bfc6d0da84eb25fd60a6de9d417a44b5 files/samba.pam 541
diff --git a/net-fs/samba/files/samba.pam b/net-fs/samba/files/samba.pam
index 2fe6ce5b6c59..2a4794007b25 100644
--- a/net-fs/samba/files/samba.pam
+++ b/net-fs/samba/files/samba.pam
@@ -1,8 +1,10 @@
#%PAM-1.0
# * pam_smbpass.so authenticates against the smbpasswd file
# * changed Redhat's 'pam_stack' with 'include' for *BSD compatibility
-# (Diego "Flameeyes" Petteno')
+# (Diego "Flameeyes" Petteno'): enable with pam>=0.78 only
auth required pam_smbpass.so nodelay
-account include system-auth
-session include system-auth
+#account include system-auth
+#session include system-auth
+account required /lib/security/pam_stack.so service=system-auth
+session required /lib/security/pam_stack.so service=system-auth
password required pam_smbpass.so nodelay smbconf=/etc/samba/smb.conf