[openssh-commits] [openssh] 06/12: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 071325f458d615d7740da5c1c1d5a8b68a0b4605
Author: jmc at openbsd.org <jmc at openbsd.org>
Date:   Fri Oct 13 16:50:45 2017 +0000

    upstream commit
    
    trim permitrootlogin description somewhat, to avoid
    ambiguity; original diff from walter alejandro iglesias, tweaked by sthen and
    myself
    
    ok sthen schwarze deraadt
    
    Upstream-ID: 1749418b2bc073f3fdd25fe21f8263c3637fe5d2
---
 sshd_config.5 | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/sshd_config.5 b/sshd_config.5
index 7e3a2dbf..77a8354a 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -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_config.5,v 1.254 2017/10/09 20:12:51 benno Exp $
-.Dd $Mdocdate: October 9 2017 $
+.\" $OpenBSD: sshd_config.5,v 1.255 2017/10/13 16:50:45 jmc Exp $
+.Dd $Mdocdate: October 13 2017 $
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME
@@ -1189,7 +1189,6 @@ Specifies whether root can log in using
 The argument must be
 .Cm yes ,
 .Cm prohibit-password ,
-.Cm without-password ,
 .Cm forced-commands-only ,
 or
 .Cm no .
@@ -1198,8 +1197,8 @@ The default is
 .Pp
 If this option is set to
 .Cm prohibit-password
-or
-.Cm without-password ,
+(or its deprecated alias,
+.Cm without-password ) ,
 password and keyboard-interactive authentication are disabled for root.
 .Pp
 If this option is set to

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.