diff options
Diffstat (limited to 'debian/patches/no-constraint-fallback.patch')
-rw-r--r-- | debian/patches/no-constraint-fallback.patch | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/debian/patches/no-constraint-fallback.patch b/debian/patches/no-constraint-fallback.patch deleted file mode 100644 index dc01085cb..000000000 --- a/debian/patches/no-constraint-fallback.patch +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | Description: ssh-add: Don't discard constraints when agent refuses request | ||
2 | This was a useful migration measure back in 2002 when constraints were new, | ||
3 | but just adds risk now. | ||
4 | Origin: upstream, http://bazaar.launchpad.net/~vcs-imports/openssh/main/revision/5777 | ||
5 | Author: Daniel Kahn Gillmor <dkg@fifthhorseman.net> | ||
6 | Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1612 | ||
7 | Bug-Ubuntu: https://bugs.launchpad.net/bugs/209447 | ||
8 | Last-Update: 2010-02-28 | ||
9 | |||
10 | Index: b/authfd.c | ||
11 | =================================================================== | ||
12 | --- a/authfd.c | ||
13 | +++ b/authfd.c | ||
14 | @@ -545,12 +545,6 @@ | ||
15 | return decode_reply(type); | ||
16 | } | ||
17 | |||
18 | -int | ||
19 | -ssh_add_identity(AuthenticationConnection *auth, Key *key, const char *comment) | ||
20 | -{ | ||
21 | - return ssh_add_identity_constrained(auth, key, comment, 0, 0); | ||
22 | -} | ||
23 | - | ||
24 | /* | ||
25 | * Removes an identity from the authentication server. This call is not | ||
26 | * meant to be used by normal applications. | ||
27 | Index: b/authfd.h | ||
28 | =================================================================== | ||
29 | --- a/authfd.h | ||
30 | +++ b/authfd.h | ||
31 | @@ -75,7 +75,6 @@ | ||
32 | int ssh_get_num_identities(AuthenticationConnection *, int); | ||
33 | Key *ssh_get_first_identity(AuthenticationConnection *, char **, int); | ||
34 | Key *ssh_get_next_identity(AuthenticationConnection *, char **, int); | ||
35 | -int ssh_add_identity(AuthenticationConnection *, Key *, const char *); | ||
36 | int ssh_add_identity_constrained(AuthenticationConnection *, Key *, | ||
37 | const char *, u_int, u_int); | ||
38 | int ssh_remove_identity(AuthenticationConnection *, Key *); | ||
39 | Index: b/ssh-add.c | ||
40 | =================================================================== | ||
41 | --- a/ssh-add.c | ||
42 | +++ b/ssh-add.c | ||
43 | @@ -203,9 +203,6 @@ | ||
44 | if (confirm != 0) | ||
45 | fprintf(stderr, | ||
46 | "The user has to confirm each use of the key\n"); | ||
47 | - } else if (ssh_add_identity(ac, private, comment)) { | ||
48 | - fprintf(stderr, "Identity added: %s (%s)\n", filename, comment); | ||
49 | - ret = 0; | ||
50 | } else { | ||
51 | fprintf(stderr, "Could not add identity: %s\n", filename); | ||
52 | } | ||