summaryrefslogtreecommitdiffstats
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 de6dce27..62fef2fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20060830
+ - (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@
+
20060824
- (dtucker) [openbsd-compat/basename.c] Include errno.h.
- (dtucker) [openbsd-compat/bsd-misc.c] Add includes needed for select(2) on
@@ -5299,4 +5306,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4510 2006/08/24 09:55:41 dtucker Exp $
+$Id: ChangeLog,v 1.4511 2006/08/30 01:06:34 djm Exp $
diff --git a/sshd_config.5 b/sshd_config.5
index 3c20c1fa..2bcaf224 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: sshd_config.5,v 1.69 2006/08/14 12:40:25 dtucker Exp $
+.\" $OpenBSD: sshd_config.5,v 1.70 2006/08/21 08:14:01 dtucker Exp $
.Dd September 25, 1999
.Dt SSHD_CONFIG 5
.Os
@@ -335,6 +335,23 @@ This option is similar to
and applies to protocol version 2 only.
The default is
.Dq no .
+.It Cm HostbasedUsesNameFromPacketOnly
+Specifies whether or not the server will attempt to perform a reverse
+name lookup when matching the name in the
+.Pa ~/.shosts ,
+.Pa ~/.rhosts ,
+and
+.Pa /etc/hosts.equiv
+files during
+.Cm HostbasedAuthentication .
+A setting of
+.Dq yes
+means that
+.Xr sshd 8
+uses the name supplied by the client rather than
+attempting to resolve the name from the TCP connection itself.
+The default is
+.Dq no .
.It Cm HostKey
Specifies a file containing a private host key
used by SSH.