summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2010-01-04 11:08:13 +0000
committerColin Watson <cjwatson@debian.org>2010-01-04 11:08:13 +0000
commite1128115a330e6e1d52b44ee70c9a89bf7be3867 (patch)
tree8f38d2246810d6895d30af7c59163195bdf23208
parentaadc833cb675906215776f63ff64a664d1d031b3 (diff)
Remove manual page references to login.conf, which aren't applicable on
non-BSD systems (closes: #154434).
-rw-r--r--debian/changelog2
-rw-r--r--sshd.81
-rw-r--r--sshd_config.53
3 files changed, 2 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index c7017089e..873b2b567 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,8 @@ openssh (1:5.2p1-1) UNRELEASED; urgency=low
48 * Remove init script stop link in rc1, as killprocs handles it already. 48 * Remove init script stop link in rc1, as killprocs handles it already.
49 * Adjust short descriptions to avoid relying on previous experience with 49 * Adjust short descriptions to avoid relying on previous experience with
50 rsh, based on suggestions from Reuben Thomas (closes: #512198). 50 rsh, based on suggestions from Reuben Thomas (closes: #512198).
51 * Remove manual page references to login.conf, which aren't applicable on
52 non-BSD systems (closes: #154434).
51 53
52 -- Colin Watson <cjwatson@debian.org> Thu, 12 Nov 2009 21:31:44 +0000 54 -- Colin Watson <cjwatson@debian.org> Thu, 12 Nov 2009 21:31:44 +0000
53 55
diff --git a/sshd.8 b/sshd.8
index 9541c2f35..6cd802537 100644
--- a/sshd.8
+++ b/sshd.8
@@ -877,7 +877,6 @@ The content of this file is not sensitive; it can be world-readable.
877.Xr ssh-vulnkey 1 , 877.Xr ssh-vulnkey 1 ,
878.Xr chroot 2 , 878.Xr chroot 2 ,
879.Xr hosts_access 5 , 879.Xr hosts_access 5 ,
880.Xr login.conf 5 ,
881.Xr moduli 5 , 880.Xr moduli 5 ,
882.Xr sshd_config 5 , 881.Xr sshd_config 5 ,
883.Xr inetd 8 , 882.Xr inetd 8 ,
diff --git a/sshd_config.5 b/sshd_config.5
index 15bd8d988..d30ad2ed1 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -204,9 +204,6 @@ This option is only available for protocol version 2.
204By default, no banner is displayed. 204By default, no banner is displayed.
205.It Cm ChallengeResponseAuthentication 205.It Cm ChallengeResponseAuthentication
206Specifies whether challenge-response authentication is allowed. 206Specifies whether challenge-response authentication is allowed.
207All authentication styles from
208.Xr login.conf 5
209are supported.
210The default is 207The default is
211.Dq yes . 208.Dq yes .
212.It Cm ChrootDirectory 209.It Cm ChrootDirectory