Attachment 1674 Details for Bug 1612 – Revised patch

[patch] Revised patch

add-constrained.diff (text/plain), 2.00 KB, created by Damien Miller on 2009-08-27 10:24:56 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2009-08-27 10:24:56 AEST

Size: 2.00 KB

patch

obsolete

>Index: authfd.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/authfd.c,v
>retrieving revision 1.80
>diff -u -p -r1.80 authfd.c
>--- authfd.c	3 Aug 2006 03:34:41 -0000	1.80
>+++ authfd.c	27 Aug 2009 00:17:19 -0000
>@@ -543,12 +543,6 @@ ssh_add_identity_constrained(Authenticat
> 	return decode_reply(type);
> }
> 
>-int
>-ssh_add_identity(AuthenticationConnection *auth, Key *key, const char *comment)
>-{
>-	return ssh_add_identity_constrained(auth, key, comment, 0, 0);
>-}
>-
> /*
>  * Removes an identity from the authentication server.  This call is not
>  * meant to be used by normal applications.
>Index: authfd.h
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/authfd.h,v
>retrieving revision 1.36
>diff -u -p -r1.36 authfd.h
>--- authfd.h	3 Aug 2006 03:34:41 -0000	1.36
>+++ authfd.h	27 Aug 2009 00:17:19 -0000
>@@ -75,7 +75,6 @@ void	ssh_close_authentication_connection
> int	 ssh_get_num_identities(AuthenticationConnection *, int);
> Key	*ssh_get_first_identity(AuthenticationConnection *, char **, int);
> Key	*ssh_get_next_identity(AuthenticationConnection *, char **, int);
>-int	 ssh_add_identity(AuthenticationConnection *, Key *, const char *);
> int	 ssh_add_identity_constrained(AuthenticationConnection *, Key *,
>     const char *, u_int, u_int);
> int	 ssh_remove_identity(AuthenticationConnection *, Key *);
>Index: ssh-add.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/ssh-add.c,v
>retrieving revision 1.90
>diff -u -p -r1.90 ssh-add.c
>--- ssh-add.c	9 Sep 2007 11:38:01 -0000	1.90
>+++ ssh-add.c	27 Aug 2009 00:17:19 -0000
>@@ -191,9 +191,6 @@ add_file(AuthenticationConnection *ac, c
> 		if (confirm != 0)
> 			fprintf(stderr,
> 			    "The user has to confirm each use of the key\n");
>-	} else if (ssh_add_identity(ac, private, comment)) {
>-		fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
>-		ret = 0;
> 	} else {
> 		fprintf(stderr, "Could not add identity: %s\n", filename);
> 	}

Actions: View | Diff

Attachments on bug 1612: 1652 | 1674