From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 27 Sep 2015 08:42:38 +0000 (+0200)
Subject: core94: allow rootlogin only if the user has not blocked it before.
X-Git-Tag: v2.17-core95~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ccb8e47d0eafccef6b69c7094b3330dc95eeef54;p=ipfire-2.x.git

core94: allow rootlogin only if the user has not blocked it before.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/config/rootfiles/core/94/update.sh b/config/rootfiles/core/94/update.sh
index e2005af01b..7dca2a1fd3 100644
--- a/config/rootfiles/core/94/update.sh
+++ b/config/rootfiles/core/94/update.sh
@@ -44,7 +44,7 @@ extract_files
 
 # Update SSH configuration
 sed -i /etc/ssh/sshd_config \
-	-e 's/^#\?PermitRootLogin .*$/PermitRootLogin yes/'
+	-e 's/^#PermitRootLogin yes$/PermitRootLogin yes/'
 
 # Move away old and unsupported keys
 mv -f /etc/ssh/ssh_host_dsa_key{,.old}