From: Darren Tucker <dtucker@zip.com.au>
Date: Mon, 12 Sep 2016 03:57:28 +0000 (+1000)
Subject: Resync ssh-keygen -W error message with upstream.
X-Git-Tag: V_7_4_P1~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7050896e7395866278c19c2ff080c26152619d1d;p=thirdparty%2Fopenssh-portable.git

Resync ssh-keygen -W error message with upstream.
---

diff --git a/ssh-keygen.c b/ssh-keygen.c
index bf7ade952..2a7939bfc 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -2485,9 +2485,9 @@ main(int argc, char **argv)
 		case 'W':
 			generator_wanted = (u_int32_t)strtonum(optarg, 1,
 			    UINT_MAX, &errstr);
-			if (errstr)
-				fatal("Desired generator has bad value: %s (%s)",
-					optarg, errstr);
+			if (errstr != NULL)
+				fatal("Desired generator invalid: %s (%s)",
+				    optarg, errstr);
 			break;
 #endif /* WITH_OPENSSL */
 		case '?':