diff options
author | Colin Watson <cjwatson@debian.org> | 2010-01-25 12:24:16 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-01-25 12:24:16 +0000 |
commit | 02d776600121afc31658f3b857ab9d41c7cad5ca (patch) | |
tree | 46d879a915140a1383efdd7bd08b66c064795824 /ssh-add.c | |
parent | 59247ecde39f2d826a94ab07f6095ca1f6644e88 (diff) |
* Backport from upstream:
- Do not fall back to adding keys without contraints (ssh-add -c / -t
...) when the agent refuses the constrained add request. This was a
useful migration measure back in 2002 when constraints were new, but
just adds risk now (LP: #209447).
Diffstat (limited to 'ssh-add.c')
-rw-r--r-- | ssh-add.c | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -203,9 +203,6 @@ add_file(AuthenticationConnection *ac, const char *filename) | |||
203 | if (confirm != 0) | 203 | if (confirm != 0) |
204 | fprintf(stderr, | 204 | fprintf(stderr, |
205 | "The user has to confirm each use of the key\n"); | 205 | "The user has to confirm each use of the key\n"); |
206 | } else if (ssh_add_identity(ac, private, comment)) { | ||
207 | fprintf(stderr, "Identity added: %s (%s)\n", filename, comment); | ||
208 | ret = 0; | ||
209 | } else { | 206 | } else { |
210 | fprintf(stderr, "Could not add identity: %s\n", filename); | 207 | fprintf(stderr, "Could not add identity: %s\n", filename); |
211 | } | 208 | } |