commit 84ef60b548ad78990e7a56a7fc4146717a5e2882
author David Pursehouse <dpursehouse@collab.net> Thu Dec 12 10:27:07 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Thu Dec 12 10:27:07 2019 +0900
tree 8fe20da2857c986de3255856b9b76e9961a07167
parent 6244123b56115572156cac4ccd1b3919595cd1f8
parent fe638f1571bdf3664dd163fddfdb0cbf2dac1ed1

Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  InitSshd: Use correct flag to set empty passphrase for all key types

Change-Id: I26152cae05ae1b92cce70bfe1ae66eb7b87c732b

java/com/google/gerrit/pgm/init/InitSshd.java

diff --git a/java/com/google/gerrit/pgm/init/InitSshd.java b/java/com/google/gerrit/pgm/init/InitSshd.java
index 68bdefc..c0adbe7 100644
--- a/java/com/google/gerrit/pgm/init/InitSshd.java
+++ b/java/com/google/gerrit/pgm/init/InitSshd.java
@@ -124,7 +124,7 @@
                   "-q" /* quiet */,
                   "-t",
                   "ed25519",
-                  "-P",
+                  "-N",
                   emptyPassphraseArg,
                   "-C",
                   comment,
@@ -152,7 +152,7 @@
                   "ecdsa",
                   "-b",
                   "256",
-                  "-P",
+                  "-N",
                   emptyPassphraseArg,
                   "-C",
                   comment,
@@ -180,7 +180,7 @@
                   "ecdsa",
                   "-b",
                   "384",
-                  "-P",
+                  "-N",
                   emptyPassphraseArg,
                   "-C",
                   comment,
@@ -208,7 +208,7 @@
                   "ecdsa",
                   "-b",
                   "521",
-                  "-P",
+                  "-N",
                   emptyPassphraseArg,
                   "-C",
                   comment,