summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Andreetta <satya@gentoo.org>2005-05-19 17:16:39 +0000
committerChristian Andreetta <satya@gentoo.org>2005-05-19 17:16:39 +0000
commit9d879dacbb0de13d87abd560ef1d09c6748977e6 (patch)
treebc97ccecb7b24d69262108ada89029d22ca4012a
parentBump. (diff)
downloadhistorical-9d879dacbb0de13d87abd560ef1d09c6748977e6.tar.gz
historical-9d879dacbb0de13d87abd560ef1d09c6748977e6.tar.bz2
historical-9d879dacbb0de13d87abd560ef1d09c6748977e6.zip
pam 'include' directive, instead of Redhat's pam_stack
Package-Manager: portage-2.0.51.22-r1
-rw-r--r--net-fs/samba/ChangeLog6
-rw-r--r--net-fs/samba/Manifest14
-rw-r--r--net-fs/samba/files/samba.pam8
3 files changed, 12 insertions, 16 deletions
diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 8fcad9e2572f..2fb751ad0afc 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,10 @@
# 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.173 2005/04/29 13:58:44 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.174 2005/05/19 17:16:39 satya Exp $
+
+ 19 May 2005; Christian Andreetta <satya@gentoo.org> files/samba.pam:
+ pam 'include' directive, instead of Redhat's pam_stack for better standard
+ adeherence (*BSD requirement: Diego Petteno' <flameeyes@gentoo.org>)
29 Apr 2005; Seemant Kulleen <seemant@gentoo.org> samba-3.0.14a-r1.ebuild:
the smbspool symlink is now fixed, thanks again to: Chris Smith
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index c49feb452081..f4ed6d3da45e 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,10 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 82365d515a7f7b7f5811220f6dadeaa9 samba-3.0.11.ebuild 8774
MD5 dba6533a0f625f4ae8e69e5f3c0cd181 samba-3.0.10.ebuild 16541
MD5 f6a911411b7e724c85f53e4b3fa88897 samba-3.0.14a-r1.ebuild 8778
-MD5 ccfaefc7832a8f0558b7480d7f494757 ChangeLog 31118
+MD5 d5a54aceb792272254a3f095ec884d6f ChangeLog 31336
MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
MD5 fa1dcd2c95a81c22c2ad68de6698a85e files/digest-samba-3.0.10 206
MD5 498babc5e33f61369f42201f25eb35c0 files/digest-samba-3.0.11 215
@@ -25,11 +22,4 @@ MD5 bf268fdddc8ef677b6fa78661a094eac files/samba.schema 16044
MD5 239ef0e21552896faeef21c685561245 files/smb.conf.example-samba3.gz 7808
MD5 3685eadb817d185b06476eca6c0c15c4 files/smbusers 204
MD5 09195dd8ab25ce77ac51c0c05b4ab93c files/system-auth-winbind 869
-MD5 b6cdc1468e45f92f19873e0c6c5b6e94 files/samba.pam 332
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCgJNRI1lqEGTUzyQRAp9kAJ9YCI4QarekjuFIUriQK7juQVZnHACfVwSo
-Seq/0+w/ZM/BvZQHLx7atSI=
-=Xmpo
------END PGP SIGNATURE-----
+MD5 583143dc547e56092963aafef6c4c9ce files/samba.pam 369
diff --git a/net-fs/samba/files/samba.pam b/net-fs/samba/files/samba.pam
index 16a3775dd898..2fe6ce5b6c59 100644
--- a/net-fs/samba/files/samba.pam
+++ b/net-fs/samba/files/samba.pam
@@ -1,6 +1,8 @@
#%PAM-1.0
-# pam_smbpass.so authenticates against the smbpasswd file
+# * pam_smbpass.so authenticates against the smbpasswd file
+# * changed Redhat's 'pam_stack' with 'include' for *BSD compatibility
+# (Diego "Flameeyes" Petteno')
auth required pam_smbpass.so nodelay
-account required /lib/security/pam_stack.so service=system-auth
-session required /lib/security/pam_stack.so service=system-auth
+account include system-auth
+session include system-auth
password required pam_smbpass.so nodelay smbconf=/etc/samba/smb.conf