summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2006-05-12 10:28:20 +0000
committerColin Watson <cjwatson@debian.org>2006-05-12 10:28:20 +0000
commite5825f76095e33e3e695f7b5f5f781d1564da846 (patch)
treeb68a51251ab09bad8285aa09218d39bd5d20f945 /debian
parent693b8b58f12854583a60d3d91aa75307b4cddd85 (diff)
* Restore pam_nologin to /etc/pam.d/ssh; sshd no longer checks this itself
when PAM is enabled, but relies on PAM to do it.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/openssh-server.ssh.pam3
2 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 2c9da1e6d..69ab84fff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,8 @@ openssh (1:4.3p2-1) UNRELEASED; urgency=low
44 http://www.sxw.org.uk/computing/patches/openssh-4.3p2-gsskex-20060223.patch 44 http://www.sxw.org.uk/computing/patches/openssh-4.3p2-gsskex-20060223.patch
45 (closes: #352042). 45 (closes: #352042).
46 * debian/rules: Resynchronise CFLAGS with that generated by configure. 46 * debian/rules: Resynchronise CFLAGS with that generated by configure.
47 * Restore pam_nologin to /etc/pam.d/ssh; sshd no longer checks this itself
48 when PAM is enabled, but relies on PAM to do it.
47 * Rename KeepAlive to TCPKeepAlive in default sshd_config 49 * Rename KeepAlive to TCPKeepAlive in default sshd_config
48 (closes: #349896). 50 (closes: #349896).
49 * Rephrase ssh/new_config and ssh/encrypted_host_key_but_no_keygen debconf 51 * Rephrase ssh/new_config and ssh/encrypted_host_key_but_no_keygen debconf
diff --git a/debian/openssh-server.ssh.pam b/debian/openssh-server.ssh.pam
index ce33b9347..d34ee091c 100644
--- a/debian/openssh-server.ssh.pam
+++ b/debian/openssh-server.ssh.pam
@@ -1,5 +1,8 @@
1# PAM configuration for the Secure Shell service 1# PAM configuration for the Secure Shell service
2 2
3# Disallow non-root logins when /etc/nologin exists.
4auth required pam_nologin.so
5
3# Read environment variables from /etc/environment and 6# Read environment variables from /etc/environment and
4# /etc/security/pam_env.conf. 7# /etc/security/pam_env.conf.
5auth required pam_env.so # [1] 8auth required pam_env.so # [1]