From 4bd6cfb874f489c3d315ce6f0767071b7fdaa14c Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Wed, 26 Jun 2019 11:12:54 +0200
Subject: [PATCH] Disable root password logins (#1722928)

---
 openssh-6.9p1-permit-root-login.patch | 12 ------------
 openssh.spec                          |  3 ---
 2 files changed, 15 deletions(-)
 delete mode 100644 openssh-6.9p1-permit-root-login.patch

diff --git a/openssh-6.9p1-permit-root-login.patch b/openssh-6.9p1-permit-root-login.patch
deleted file mode 100644
index 6b4c4da..0000000
--- a/openssh-6.9p1-permit-root-login.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up openssh-7.0p1/sshd_config.root-login openssh-7.0p1/sshd_config
---- openssh-7.0p1/sshd_config.root-login	2015-08-12 11:29:12.919269245 +0200
-+++ openssh-7.0p1/sshd_config	2015-08-12 11:31:03.653096466 +0200
-@@ -46,7 +46,7 @@ SyslogFacility AUTHPRIV
- # Authentication:
- 
- #LoginGraceTime 2m
--#PermitRootLogin prohibit-password
-+PermitRootLogin yes
- #StrictModes yes
- #MaxAuthTries 6
- #MaxSessions 10
diff --git a/openssh.spec b/openssh.spec
index e68adb9..8fd8a12 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -185,8 +185,6 @@ Patch919: openssh-6.6.1p1-scp-non-existing-directory.patch
 Patch922: openssh-6.8p1-sshdT-output.patch
 # Add sftp option to force mode of created files (#1191055)
 Patch926: openssh-6.7p1-sftp-force-permission.patch
-# Restore compatible default (#89216)
-Patch929: openssh-6.9p1-permit-root-login.patch
 # make s390 use /dev/ crypto devices -- ignore closefrom
 Patch939: openssh-7.2p2-s390-closefrom.patch
 # Move MAX_DISPLAYS to a configuration option (#1341302)
@@ -411,7 +409,6 @@ popd
 %patch802 -p1 -b .GSSAPIEnablek5users
 %patch922 -p1 -b .sshdt
 %patch926 -p1 -b .sftp-force-mode
-%patch929 -p1 -b .root-login
 %patch939 -p1 -b .s390-dev
 %patch944 -p1 -b .x11max
 %patch948 -p1 -b .systemd