diff options
author | Colin Watson <cjwatson@debian.org> | 2010-02-27 14:05:10 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-02-27 14:05:10 +0000 |
commit | 8dcc7c5ef45cf5032dca7a308ffe17d3935e62d5 (patch) | |
tree | 2e0d8058bdfc24a60a20c5bcbfd1075ef1048ff3 /debian/patches/no-constraint-fallback.patch | |
parent | e44a1fb6e8e59e67e5c8b6e83c0d8566d146aad9 (diff) |
Convert to source format 3.0 (quilt).
Diffstat (limited to 'debian/patches/no-constraint-fallback.patch')
-rw-r--r-- | debian/patches/no-constraint-fallback.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/debian/patches/no-constraint-fallback.patch b/debian/patches/no-constraint-fallback.patch new file mode 100644 index 000000000..139d1ec73 --- /dev/null +++ b/debian/patches/no-constraint-fallback.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | Index: b/authfd.c | ||
2 | =================================================================== | ||
3 | --- a/authfd.c | ||
4 | +++ b/authfd.c | ||
5 | @@ -545,12 +545,6 @@ | ||
6 | return decode_reply(type); | ||
7 | } | ||
8 | |||
9 | -int | ||
10 | -ssh_add_identity(AuthenticationConnection *auth, Key *key, const char *comment) | ||
11 | -{ | ||
12 | - return ssh_add_identity_constrained(auth, key, comment, 0, 0); | ||
13 | -} | ||
14 | - | ||
15 | /* | ||
16 | * Removes an identity from the authentication server. This call is not | ||
17 | * meant to be used by normal applications. | ||
18 | Index: b/authfd.h | ||
19 | =================================================================== | ||
20 | --- a/authfd.h | ||
21 | +++ b/authfd.h | ||
22 | @@ -75,7 +75,6 @@ | ||
23 | int ssh_get_num_identities(AuthenticationConnection *, int); | ||
24 | Key *ssh_get_first_identity(AuthenticationConnection *, char **, int); | ||
25 | Key *ssh_get_next_identity(AuthenticationConnection *, char **, int); | ||
26 | -int ssh_add_identity(AuthenticationConnection *, Key *, const char *); | ||
27 | int ssh_add_identity_constrained(AuthenticationConnection *, Key *, | ||
28 | const char *, u_int, u_int); | ||
29 | int ssh_remove_identity(AuthenticationConnection *, Key *); | ||
30 | Index: b/ssh-add.c | ||
31 | =================================================================== | ||
32 | --- a/ssh-add.c | ||
33 | +++ b/ssh-add.c | ||
34 | @@ -203,9 +203,6 @@ | ||
35 | if (confirm != 0) | ||
36 | fprintf(stderr, | ||
37 | "The user has to confirm each use of the key\n"); | ||
38 | - } else if (ssh_add_identity(ac, private, comment)) { | ||
39 | - fprintf(stderr, "Identity added: %s (%s)\n", filename, comment); | ||
40 | - ret = 0; | ||
41 | } else { | ||
42 | fprintf(stderr, "Could not add identity: %s\n", filename); | ||
43 | } | ||