summaryrefslogtreecommitdiff
path: root/ssh-add.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2004-03-01 02:25:32 +0000
committerColin Watson <cjwatson@debian.org>2004-03-01 02:25:32 +0000
commitea8116a11e3de70036dbc665ccb0d486cf89cac9 (patch)
treed73ccdff78d8608e156465af42e6a1b3527fb2d6 /ssh-add.c
parente39b311381a5609cc05acf298c42fba196dc524b (diff)
parentf5bda272678ec6dccaa5f29379cf60cb855018e8 (diff)
Merge 3.8p1 to the trunk. This builds and runs, but I haven't tested it
extensively yet. ProtocolKeepAlives is now just a compatibility alias for ServerAliveInterval.
Diffstat (limited to 'ssh-add.c')
-rw-r--r--ssh-add.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ssh-add.c b/ssh-add.c
index 2e394e5c1..e7699c95c 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -35,7 +35,7 @@
35 */ 35 */
36 36
37#include "includes.h" 37#include "includes.h"
38RCSID("$OpenBSD: ssh-add.c,v 1.68 2003/06/16 10:22:45 markus Exp $"); 38RCSID("$OpenBSD: ssh-add.c,v 1.69 2003/11/21 11:57:03 djm Exp $");
39 39
40#include <openssl/evp.h> 40#include <openssl/evp.h>
41 41
@@ -169,14 +169,14 @@ add_file(AuthenticationConnection *ac, const char *filename)
169 } 169 }
170 } 170 }
171 171
172 if (ssh_add_identity_constrained(ac, private, comment, lifetime, 172 if (ssh_add_identity_constrained(ac, private, comment, lifetime,
173 confirm)) { 173 confirm)) {
174 fprintf(stderr, "Identity added: %s (%s)\n", filename, comment); 174 fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
175 ret = 0; 175 ret = 0;
176 if (lifetime != 0) 176 if (lifetime != 0)
177 fprintf(stderr, 177 fprintf(stderr,
178 "Lifetime set to %d seconds\n", lifetime); 178 "Lifetime set to %d seconds\n", lifetime);
179 if (confirm != 0) 179 if (confirm != 0)
180 fprintf(stderr, 180 fprintf(stderr,
181 "The user has to confirm each use of the key\n"); 181 "The user has to confirm each use of the key\n");
182 } else if (ssh_add_identity(ac, private, comment)) { 182 } else if (ssh_add_identity(ac, private, comment)) {