summaryrefslogtreecommitdiff
path: root/net-fs
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
commit8cd09e61d01276c7b6986a378aed2173c8da584d (patch)
treecea0a1a16de7cf543290a20ef2a5b138fe89f572 /net-fs
parentAdded to ~ppc (diff)
downloadgentoo-2-8cd09e61d01276c7b6986a378aed2173c8da584d.tar.gz
gentoo-2-8cd09e61d01276c7b6986a378aed2173c8da584d.tar.bz2
gentoo-2-8cd09e61d01276c7b6986a378aed2173c8da584d.zip
reverting pam to old behaviour until pam-0.78 becomes stable
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'net-fs')
-rw-r--r--net-fs/samba/ChangeLog5
-rw-r--r--net-fs/samba/files/samba.pam8
2 files changed, 9 insertions, 4 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/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