From: djm@openbsd.org <djm@openbsd.org>
Date: Fri, 8 Nov 2019 03:54:02 +0000 (+0000)
Subject: upstream: duplicate 'x' character in getopt(3) optstring
X-Git-Tag: V_8_2_P1~347
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa1c9e37789f999979fe59df74ce5c8424861ac8;p=thirdparty%2Fopenssh-portable.git

upstream: duplicate 'x' character in getopt(3) optstring

OpenBSD-Commit-ID: 64c81caa0cb5798de3621eca16b7dd22e5d0d8a7
---

diff --git a/ssh-keygen.c b/ssh-keygen.c
index b51173aa3..ac34f314b 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.360 2019/11/07 08:38:38 naddy Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.361 2019/11/08 03:54:02 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2824,7 +2824,7 @@ main(int argc, char **argv)
 	sk_provider = getenv("SSH_SK_PROVIDER");
 
 	/* Remaining character: d */
-	while ((opt = getopt(argc, argv, "ABHLQUXceghiklopquvxy"
+	while ((opt = getopt(argc, argv, "ABHLQUXceghiklopquvy"
 	    "C:D:E:F:G:I:J:K:M:N:O:P:R:S:T:V:W:Y:Z:"
 	    "a:b:f:g:j:m:n:r:s:t:w:x:z:")) != -1) {
 		switch (opt) {