Correctly revert "PermitRootLogin no" option from upstream sources

This commit is contained in:
Jakub Jelen 2015-07-01 15:42:42 +02:00
parent 535d341e70
commit 5de6c89ff2
2 changed files with 30 additions and 0 deletions

View File

@ -0,0 +1,27 @@
diff --git a/sshd_config b/sshd_config
index c9042ac..cf7d8e1 100644
--- a/sshd_config
+++ b/sshd_config
@@ -41,7 +41,7 @@
# Authentication:
#LoginGraceTime 2m
-#PermitRootLogin no
+#PermitRootLogin yes
#StrictModes yes
#MaxAuthTries 6
#MaxSessions 10
diff --git a/sshd_config.5 b/sshd_config.5
index 2bc9360..d3148c2 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -1093,7 +1093,7 @@ The argument must be
or
.Dq no .
The default is
-.Dq no .
+.Dq yes .
.Pp
If this option is set to
.Dq without-password ,

View File

@ -221,6 +221,8 @@ Patch926: openssh-6.7p1-sftp-force-permission.patch
# Memory problems
# https://bugzilla.mindrot.org/show_bug.cgi?id=2401
Patch928: openssh-6.8p1-memory-problems.patch
# Restore compatible default (#89216)
Patch929: openssh-6.9p1-permit-root-login.patch
@ -443,6 +445,7 @@ popd
%patch925 -p1 -b .newline
%patch926 -p1 -b .sftp-force-mode
%patch928 -p1 -b .memory
%patch929 -p1 -b .root-login
%patch200 -p1 -b .audit
%patch700 -p1 -b .fips