Attachment 1916 Details for Bug 1668 – Patch suitable for openssh-5.6p1

[patch] Patch suitable for openssh-5.6p1

openssh-5.6p1-keygen.patch (text/plain), 2.60 KB, created by jchadima on 2010-09-03 23:13:32 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: jchadima

Created: 2010-09-03 23:13:32 AEST

Size: 2.60 KB

patch

obsolete

>diff -up openssh-5.6p1/ssh-keygen.0.keygen openssh-5.6p1/ssh-keygen.0
>--- openssh-5.6p1/ssh-keygen.0.keygen	2010-08-22 16:30:03.000000000 +0200
>+++ openssh-5.6p1/ssh-keygen.0	2010-08-23 12:37:19.000000000 +0200
>@@ -4,7 +4,7 @@ NAME
>      ssh-keygen - authentication key generation, management and conversion
> 
> SYNOPSIS
>-     ssh-keygen [-q] [-b bits] -t type [-N new_passphrase] [-C comment]
>+     ssh-keygen [-q] [-o] [-b bits] -t type [-N new_passphrase] [-C comment]
>                 [-f output_keyfile]
>      ssh-keygen -p [-P old_passphrase] [-N new_passphrase] [-f keyfile]
>      ssh-keygen -i [-m key_format] [-f input_keyfile]
>@@ -232,6 +232,8 @@ DESCRIPTION
> 
>      -q      Silence ssh-keygen.  Used by /etc/rc when creating a new key.
> 
>+     -o      Overwrite the key without prompting user.
>+
>      -R hostname
>              Removes all keys belonging to hostname from a known_hosts file.
>              This option is useful to delete hashed hosts (see the -H option
>diff -up openssh-5.6p1/ssh-keygen.1.keygen openssh-5.6p1/ssh-keygen.1
>--- openssh-5.6p1/ssh-keygen.1.keygen	2010-08-05 05:05:32.000000000 +0200
>+++ openssh-5.6p1/ssh-keygen.1	2010-08-23 12:36:25.000000000 +0200
>@@ -47,6 +47,7 @@
> .Bk -words
> .Nm ssh-keygen
> .Op Fl q
>+.Op Fl o
> .Op Fl b Ar bits
> .Fl t Ar type
> .Op Fl N Ar new_passphrase
>@@ -397,6 +398,8 @@ Silence
> Used by
> .Pa /etc/rc
> when creating a new key.
>+.It Fl o
>+Overwrite the key without prompting user.
> .It Fl R Ar hostname
> Removes all keys belonging to
> .Ar hostname
>diff -up openssh-5.6p1/ssh-keygen.c.keygen openssh-5.6p1/ssh-keygen.c
>--- openssh-5.6p1/ssh-keygen.c.keygen	2010-08-05 05:05:32.000000000 +0200
>+++ openssh-5.6p1/ssh-keygen.c	2010-08-23 12:34:40.000000000 +0200
>@@ -72,6 +72,7 @@ int change_passphrase = 0;
> int change_comment = 0;
> 
> int quiet = 0;
>+int overwrite = 0;
> 
> int log_level = SYSLOG_LEVEL_INFO;
> 
>@@ -1798,7 +1799,7 @@ main(int argc, char **argv)
> 		exit(1);
> 	}
> 
>-	while ((opt = getopt(argc, argv, "degiqpclBHLhvxXyF:b:f:t:D:I:P:m:N:n:"
>+	while ((opt = getopt(argc, argv, "degiqopclBHLhvxXyF:b:f:t:D:I:P:m:N:n:"
> 	    "O:C:r:g:R:T:G:M:S:s:a:V:W:z:")) != -1) {
> 		switch (opt) {
> 		case 'b':
>@@ -1878,6 +1879,9 @@ main(int argc, char **argv)
> 		case 'q':
> 			quiet = 1;
> 			break;
>+		case 'o':
>+			overwrite = 1;
>+			break;
> 		case 'e':
> 		case 'x':
> 			/* export key */
>@@ -2124,7 +2128,7 @@ main(int argc, char **argv)
> 		}
> 	}
> 	/* If the file already exists, ask the user to confirm. */
>-	if (stat(identity_file, &st) >= 0) {
>+	if (!overwrite && stat(identity_file, &st) >= 0) {
> 		char yesno[3];
> 		printf("%s already exists.\n", identity_file);
> 		printf("Overwrite (y/n)? ");

Actions: View | Diff

Attachments on bug 1668: 1714 | 1715 | 1916