Attachment #1714 for bug #1668

Lines 4-10 NAME Link Here

(-)openssh-5.3p1/ssh-keygen.0.keygen (-1 / +3 lines)
4	ssh-keygen - authentication key generation, management and conversion	4	ssh-keygen - authentication key generation, management and conversion
5		5
6	SYNOPSIS	6	SYNOPSIS
7	ssh-keygen [-q] [-b bits] -t type [-N new_passphrase] [-C comment]	7	ssh-keygen [-q] [-o] [-b bits] -t type [-N new_passphrase] [-C comment]
8	[-f output_keyfile]	8	[-f output_keyfile]
9	ssh-keygen -p [-P old_passphrase] [-N new_passphrase] [-f keyfile]	9	ssh-keygen -p [-P old_passphrase] [-N new_passphrase] [-f keyfile]
10	ssh-keygen -i [-f input_keyfile]	10	ssh-keygen -i [-f input_keyfile]
Lines 151-156 DESCRIPTION Link Here
151		151
152	-q Silence ssh-keygen. Used by /etc/rc when creating a new key.	152	-q Silence ssh-keygen. Used by /etc/rc when creating a new key.
153		153
		154	-o Override the key without prompting user.
		155
154	-R hostname	156	-R hostname
155	Removes all keys belonging to hostname from a known_hosts file.	157	Removes all keys belonging to hostname from a known_hosts file.
156	This option is useful to delete hashed hosts (see the -H option	158	This option is useful to delete hashed hosts (see the -H option

Lines 47-52 Link Here

(-)openssh-5.3p1/ssh-keygen.1.keygen (+3 lines)
47	.Nm ssh-keygen	47	.Nm ssh-keygen
48	.Bk -words	48	.Bk -words
49	.Op Fl q	49	.Op Fl q
		50	.Op Fl o
50	.Op Fl b Ar bits	51	.Op Fl b Ar bits
51	.Fl t Ar type	52	.Fl t Ar type
52	.Op Fl N Ar new_passphrase	53	.Op Fl N Ar new_passphrase
Lines 285-290 Silence Link Here
285	Used by	286	Used by
286	.Pa /etc/rc	287	.Pa /etc/rc
287	when creating a new key.	288	when creating a new key.
		289	.It Fl o
		290	Override the key without prompting user.
288	.It Fl R Ar hostname	291	.It Fl R Ar hostname
289	Removes all keys belonging to	292	Removes all keys belonging to
290	.Ar hostname	293	.Ar hostname

Lines 77-82 int change_passphrase = 0; Link Here

(-)openssh-5.3p1/ssh-keygen.c.keygen (-2 / +6 lines)
77	int change_comment = 0;	77	int change_comment = 0;
78		78
79	int quiet = 0;	79	int quiet = 0;
		80	int override = 0;
80		81
81	int log_level = SYSLOG_LEVEL_INFO;	82	int log_level = SYSLOG_LEVEL_INFO;
82		83
Lines 1143-1149 main(int argc, char **argv) Link Here
1143	}	1144	}
1144		1145
1145	while ((opt = getopt(argc, argv,	1146	while ((opt = getopt(argc, argv,
1146	"degiqpclnBHvxXyF:b:f:t:U:D:P:N:C:r:g:R:T:G:M:S:a:W:")) != -1) {	1147	"degiqopclnBHvxXyF:b:f:t:U:D:P:N:C:r:g:R:T:G:M:S:a:W:")) != -1) {
1147	switch (opt) {	1148	switch (opt) {
1148	case 'b':	1149	case 'b':
1149	bits = (u_int32_t)strtonum(optarg, 768, 32768, &errstr);	1150	bits = (u_int32_t)strtonum(optarg, 768, 32768, &errstr);
Lines 1199-1204 main(int argc, char **argv) Link Here
1199	case 'q':	1200	case 'q':
1200	quiet = 1;	1201	quiet = 1;
1201	break;	1202	break;
		1203	case 'o':
		1204	override = 1;
		1205	break;
1202	case 'e':	1206	case 'e':
1203	case 'x':	1207	case 'x':
1204	/* export key */	1208	/* export key */
Lines 1426-1432 main(int argc, char **argv) Link Here
1426	printf("Created directory '%s'.\n", dotsshdir);	1430	printf("Created directory '%s'.\n", dotsshdir);
1427	}	1431	}
1428	/* If the file already exists, ask the user to confirm. */	1432	/* If the file already exists, ask the user to confirm. */
1429	if (stat(identity_file, &st) >= 0) {	1433	if (!override && stat(identity_file, &st) >= 0) {
1430	char yesno[3];	1434	char yesno[3];
1431	printf("%s already exists.\n", identity_file);	1435	printf("%s already exists.\n", identity_file);
1432	printf("Overwrite (y/n)? ");	1436	printf("Overwrite (y/n)? ");

Return to bug 1668