summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-08-30 11:06:34 +1000
committerDamien Miller <djm@mindrot.org>2006-08-30 11:06:34 +1000
commitb594f38bae891e5149e3c0a7e6d7b4d501b50c01 (patch)
tree35302ebfc0be196c795b4f7306777223a1517716
parent9162028887ac2cd40e66b08868748e53f8d9d1ac (diff)
- (djm) OpenBSD CVS Sync
- dtucker@cvs.openbsd.org 2006/08/21 08:14:01 [sshd_config.5] Document HostbasedUsesNameFromPacketOnly. Corrections from jmc@, ok jmc@ djm@
-rw-r--r--ChangeLog9
-rw-r--r--sshd_config.519
2 files changed, 26 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index de6dce270..62fef2fc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
120060830
2 - (djm) OpenBSD CVS Sync
3 - dtucker@cvs.openbsd.org 2006/08/21 08:14:01
4 [sshd_config.5]
5 Document HostbasedUsesNameFromPacketOnly. Corrections from jmc@,
6 ok jmc@ djm@
7
120060824 820060824
2 - (dtucker) [openbsd-compat/basename.c] Include errno.h. 9 - (dtucker) [openbsd-compat/basename.c] Include errno.h.
3 - (dtucker) [openbsd-compat/bsd-misc.c] Add includes needed for select(2) on 10 - (dtucker) [openbsd-compat/bsd-misc.c] Add includes needed for select(2) on
@@ -5299,4 +5306,4 @@
5299 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5306 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5300 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5307 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5301 5308
5302$Id: ChangeLog,v 1.4510 2006/08/24 09:55:41 dtucker Exp $ 5309$Id: ChangeLog,v 1.4511 2006/08/30 01:06:34 djm Exp $
diff --git a/sshd_config.5 b/sshd_config.5
index 3c20c1faa..2bcaf2245 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: sshd_config.5,v 1.69 2006/08/14 12:40:25 dtucker Exp $ 37.\" $OpenBSD: sshd_config.5,v 1.70 2006/08/21 08:14:01 dtucker Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD_CONFIG 5 39.Dt SSHD_CONFIG 5
40.Os 40.Os
@@ -335,6 +335,23 @@ This option is similar to
335and applies to protocol version 2 only. 335and applies to protocol version 2 only.
336The default is 336The default is
337.Dq no . 337.Dq no .
338.It Cm HostbasedUsesNameFromPacketOnly
339Specifies whether or not the server will attempt to perform a reverse
340name lookup when matching the name in the
341.Pa ~/.shosts ,
342.Pa ~/.rhosts ,
343and
344.Pa /etc/hosts.equiv
345files during
346.Cm HostbasedAuthentication .
347A setting of
348.Dq yes
349means that
350.Xr sshd 8
351uses the name supplied by the client rather than
352attempting to resolve the name from the TCP connection itself.
353The default is
354.Dq no .
338.It Cm HostKey 355.It Cm HostKey
339Specifies a file containing a private host key 356Specifies a file containing a private host key
340used by SSH. 357used by SSH.