2 files changed, 13 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 5d10b5654..c581ff0fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openssh (1:6.6p1-2) UNRELEASED; urgency=medium
+
+  * If no root password is set, then switch to "PermitRootLogin
+    without-password" without asking (LP: #1300127).
+
+ -- Colin Watson <cjwatson@debian.org>  Mon, 31 Mar 2014 11:15:02 +0100
+
 openssh (1:6.6p1-1) unstable; urgency=medium
 
   [ Colin Watson ]
diff --git a/debian/openssh-server.config b/debian/openssh-server.config
index 27594ad2d..883dbf41b 100644
--- a/debian/openssh-server.config
+++ b/debian/openssh-server.config
@@ -16,8 +16,12 @@ get_config_option() {
 
 if dpkg --compare-versions "$2" lt-nl 1:6.6p1-1 && \
    [ "$(get_config_option PermitRootLogin)" = yes ]; then
-        db_input high openssh-server/permit-root-login || true
-        db_go
+        if [ "$(getent shadow root | cut -d: -f2)" = "!" ]; then
+                db_set openssh-server/permit-root-login true
+        else
+                db_input high openssh-server/permit-root-login || true
+                db_go
+        fi
 fi
 
 exit 0