From owner-svn-src-all@freebsd.org Mon Feb 1 20:29:53 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8A9D7A989BA; Mon, 1 Feb 2016 20:29:53 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 6DE3F1C11; Mon, 1 Feb 2016 20:29:53 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [IPv6:::1]) by freefall.freebsd.org (Postfix) with ESMTP id 61C0F1885; Mon, 1 Feb 2016 20:29:53 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id AC4551A29F; Mon, 1 Feb 2016 20:29:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id FLTnAc5lTB7H; Mon, 1 Feb 2016 20:29:45 +0000 (UTC) Subject: Re: svn commit: r294464 - in head: crypto/openssh crypto/openssh/contrib/redhat crypto/openssh/contrib/suse crypto/openssh/openbsd-compat crypto/openssh/regress crypto/openssh/regress/unittests crypto/... DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 787641A294 To: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201601202257.u0KMvA89056089@repo.freebsd.org> From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: <56AFC036.6080508@FreeBSD.org> Date: Mon, 1 Feb 2016 12:29:42 -0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <201601202257.u0KMvA89056089@repo.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="G03gruP8aV9OtCrwFcegJ2x7u81GokLpO" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Feb 2016 20:29:53 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --G03gruP8aV9OtCrwFcegJ2x7u81GokLpO Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 1/20/2016 2:57 PM, Dag-Erling Sm=C3=B8rgrav wrote: > Author: des > Date: Wed Jan 20 22:57:10 2016 > New Revision: 294464 > URL: https://svnweb.freebsd.org/changeset/base/294464 >=20 > Log: > Upgrade to OpenSSH 7.0p1. =2E.. > Index: crypto/openssh/sshd_config > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- crypto/openssh/sshd_config (revision 294463) > +++ crypto/openssh/sshd_config (revision 294464) > @@ -1,4 +1,4 @@ > -# $OpenBSD: sshd_config,v 1.95 2015/04/27 21:42:48 djm Exp $ > +# $OpenBSD: sshd_config,v 1.97 2015/08/06 14:53:21 deraadt Exp $ > # $FreeBSD$ >=20 > # This is the sshd server system-wide configuration file. See > @@ -45,7 +45,7 @@ > # Authentication: >=20 > #LoginGraceTime 2m > -#PermitRootLogin no > +#PermitRootLogin prohibit-password > #StrictModes yes > #MaxAuthTries 6 > #MaxSessions 10 Shouldn't the comments note the default? The default here is still 'no'. Upstream 7.1p2 does use PERMIT_NO_PASSWD rather than PERMIT_NO that we have. I think we should make this change: > Index: crypto/openssh/servconf.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- crypto/openssh/servconf.c (revision 294275) > +++ crypto/openssh/servconf.c (working copy) > @@ -202,7 +202,7 @@ > if (options->key_regeneration_time =3D=3D -1) > options->key_regeneration_time =3D 3600; > if (options->permit_root_login =3D=3D PERMIT_NOT_SET) > - options->permit_root_login =3D PERMIT_NO; > + options->permit_root_login =3D PERMIT_NO_PASSWD; > if (options->ignore_rhosts =3D=3D -1) > options->ignore_rhosts =3D 1; > if (options->ignore_user_known_hosts =3D=3D -1) --=20 Regards, Bryan Drewery --G03gruP8aV9OtCrwFcegJ2x7u81GokLpO Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJWr8BBAAoJEDXXcbtuRpfPJUEH/jCp2P0zdoqXT8R9lySoMJx1 Lfa8+v4U2ZuPiclEitHxZj0C0mugx0p6I5PC60vd7XX4//WNqNNANTxc6gIey/7I aQqlxI3/7AzNpi3Q6zlEemAOV9GWxQxbWwlArZVUJAkWj5GoMRx7ZRmch6ebosO3 4iSE8zZwVCIFq53V6J6MLEfyRLF0I17OkffyF85VbUiLS61TeAN6PWk04CQz9Xdl QyV5YVNpL6cvpPyYG/Vv9nl321YYv7nrYeRLnFnCH1jRtW7bgQGJuViSDYQk+Q7Y qTFQWlSZ9ngjlMdl2gYUQAnT4mAySfE11JNOeSC1gys6JLbPhTp4N+yXzKgzOtE= =fcFM -----END PGP SIGNATURE----- --G03gruP8aV9OtCrwFcegJ2x7u81GokLpO--