Attachment #1916 for bug #1668

Lines 4-10 NAME Link Here

(-)openssh-5.6p1/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 [-m key_format] [-f input_keyfile]	10	ssh-keygen -i [-m key_format] [-f input_keyfile]
Lines 232-237 DESCRIPTION Link Here
232		232
233	-q Silence ssh-keygen. Used by /etc/rc when creating a new key.	233	-q Silence ssh-keygen. Used by /etc/rc when creating a new key.
234		234
		235	-o Overwrite the key without prompting user.
		236
235	-R hostname	237	-R hostname
236	Removes all keys belonging to hostname from a known_hosts file.	238	Removes all keys belonging to hostname from a known_hosts file.
237	This option is useful to delete hashed hosts (see the -H option	239	This option is useful to delete hashed hosts (see the -H option

Lines 47-52 Link Here

(-)openssh-5.6p1/ssh-keygen.1.keygen (+3 lines)
47	.Bk -words	47	.Bk -words
48	.Nm ssh-keygen	48	.Nm ssh-keygen
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 397-402 Silence Link Here
397	Used by	398	Used by
398	.Pa /etc/rc	399	.Pa /etc/rc
399	when creating a new key.	400	when creating a new key.
		401	.It Fl o
		402	Overwrite the key without prompting user.
400	.It Fl R Ar hostname	403	.It Fl R Ar hostname
401	Removes all keys belonging to	404	Removes all keys belonging to
402	.Ar hostname	405	.Ar hostname

Lines 72-77 int change_passphrase = 0; Link Here

(-)openssh-5.6p1/ssh-keygen.c.keygen (-2 / +6 lines)
72	int change_comment = 0;	72	int change_comment = 0;
73		73
74	int quiet = 0;	74	int quiet = 0;
		75	int overwrite = 0;
75		76
76	int log_level = SYSLOG_LEVEL_INFO;	77	int log_level = SYSLOG_LEVEL_INFO;
77		78
Lines 1798-1804 main(int argc, char **argv) Link Here
1798	exit(1);	1799	exit(1);
1799	}	1800	}
1800		1801
1801	while ((opt = getopt(argc, argv, "degiqpclBHLhvxXyF:b:f:t:D:I:P:m:N:n:"	1802	while ((opt = getopt(argc, argv, "degiqopclBHLhvxXyF:b:f:t:D:I:P:m:N:n:"
1802	"O:C:r:g:R:T:G:M:S:s:a:V:W:z:")) != -1) {	1803	"O:C:r:g:R:T:G:M:S:s:a:V:W:z:")) != -1) {
1803	switch (opt) {	1804	switch (opt) {
1804	case 'b':	1805	case 'b':
Lines 1878-1883 main(int argc, char **argv) Link Here
1878	case 'q':	1879	case 'q':
1879	quiet = 1;	1880	quiet = 1;
1880	break;	1881	break;
		1882	case 'o':
		1883	overwrite = 1;
		1884	break;
1881	case 'e':	1885	case 'e':
1882	case 'x':	1886	case 'x':
1883	/* export key */	1887	/* export key */
Lines 2124-2130 main(int argc, char **argv) Link Here
2124	}	2128	}
2125	}	2129	}
2126	/* If the file already exists, ask the user to confirm. */	2130	/* If the file already exists, ask the user to confirm. */
2127	if (stat(identity_file, &st) >= 0) {	2131	if (!overwrite && stat(identity_file, &st) >= 0) {
2128	char yesno[3];	2132	char yesno[3];
2129	printf("%s already exists.\n", identity_file);	2133	printf("%s already exists.\n", identity_file);
2130	printf("Overwrite (y/n)? ");	2134	printf("Overwrite (y/n)? ");

Return to bug 1668