summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2014-02-10 03:08:45 +0000
committerColin Watson <cjwatson@debian.org>2014-02-10 03:08:45 +0000
commitca7f6f719ad5f168b25165caaff658f21c784c4e (patch)
treeca5f159311e5786b602b523e397fa7dbd31d100e
parenta2b8818c5d21cfcba443625251f691a2ea3a29c7 (diff)
Add the pam_keyinit session module, to create a new session keyring on login (closes: #734816).
-rw-r--r--debian/changelog2
-rw-r--r--debian/openssh-server.sshd.pam3
2 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 38869d995..1b0e27201 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ openssh (1:6.5p1-1) UNRELEASED; urgency=medium
18 reasoning. 18 reasoning.
19 * Add OpenPGP signature checking configuration to watch file (thanks, 19 * Add OpenPGP signature checking configuration to watch file (thanks,
20 Daniel Kahn Gillmor; closes: #732441). 20 Daniel Kahn Gillmor; closes: #732441).
21 * Add the pam_keyinit session module, to create a new session keyring on
22 login (closes: #734816).
21 23
22 -- Colin Watson <cjwatson@debian.org> Sun, 09 Feb 2014 15:52:14 +0000 24 -- Colin Watson <cjwatson@debian.org> Sun, 09 Feb 2014 15:52:14 +0000
23 25
diff --git a/debian/openssh-server.sshd.pam b/debian/openssh-server.sshd.pam
index 5f7ab2f60..7978b0c64 100644
--- a/debian/openssh-server.sshd.pam
+++ b/debian/openssh-server.sshd.pam
@@ -21,6 +21,9 @@ session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_
21# Set the loginuid process attribute. 21# Set the loginuid process attribute.
22session required pam_loginuid.so 22session required pam_loginuid.so
23 23
24# Create a new session keyring.
25session optional pam_keyinit.so force revoke
26
24# Standard Un*x session setup and teardown. 27# Standard Un*x session setup and teardown.
25@include common-session 28@include common-session
26 29