* 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).

1 files changed, 0 insertions, 3 deletions

diff --git a/ssh-add.c b/ssh-add.c
index d58c82156..b31a88636 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -203,9 +203,6 @@ add_file(AuthenticationConnection *ac, const char *filename)
                 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);
         }