From: djm@openbsd.org <djm@openbsd.org>
Date: Fri, 5 Feb 2016 03:07:06 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_7_2_P1~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=deae7d52d59c5019c528f977360d87fdda15d20b;p=thirdparty%2Fopenssh-portable.git

upstream commit

mention internal DH-GEX fallback groups; bz#2302

Upstream-ID: e7b395fcca3122cd825515f45a2e41c9a157e09e
---

diff --git a/sshd.8 b/sshd.8
index 9bf3d5bb2..e658523a5 100644
--- a/sshd.8
+++ b/sshd.8
@@ -33,8 +33,8 @@
 .\" (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.8,v 1.282 2015/11/16 00:30:02 djm Exp $
-.Dd $Mdocdate: November 16 2015 $
+.\" $OpenBSD: sshd.8,v 1.283 2016/02/05 03:07:06 djm Exp $
+.Dd $Mdocdate: February 5 2016 $
 .Dt SSHD 8
 .Os
 .Sh NAME
@@ -888,9 +888,12 @@ This file is for host-based authentication (see
 It should only be writable by root.
 .Pp
 .It Pa /etc/moduli
-Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange".
+Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange"
+key exchange method.
 The file format is described in
 .Xr moduli 5 .
+If no usable groups are found in this file then fixed internal groups will
+be used.
 .Pp
 .It Pa /etc/motd
 See