From: Darren Tucker <dtucker@zip.com.au>
Date: Mon, 12 Sep 2016 01:07:00 +0000 (+1000)
Subject: Restore ssh-keygen's -J and -j option handling.
X-Git-Tag: V_7_4_P1~128
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bb2980260fb24e5e0b51adac471395781b66261;p=thirdparty%2Fopenssh-portable.git

Restore ssh-keygen's -J and -j option handling.

These were incorrectly removed in the 1d9a2e28 sync commit.
---

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 0bd5fc93a..3ba50d85b 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -2466,6 +2466,12 @@ main(int argc, char **argv)
 			    sizeof(out_file))
 				fatal("Output filename too long");
 			break;
+		case 'J':
+			lines_to_process = strtoul(optarg, NULL, 10);
+                        break;
+		case 'j':
+			start_lineno = strtoul(optarg, NULL, 10);
+                        break;
 		case 'T':
 			do_screen_candidates = 1;
 			if (strlcpy(out_file, optarg, sizeof(out_file)) >=