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.

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 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-add.c,v 1.68 2003/06/16 10:22:45 markus Exp $");
+RCSID("$OpenBSD: ssh-add.c,v 1.69 2003/11/21 11:57:03 djm Exp $");
 
 #include <openssl/evp.h>
 
@@ -169,14 +169,14 @@ add_file(AuthenticationConnection *ac, const char *filename)
                 }
         }
 
-        if (ssh_add_identity_constrained(ac, private, comment, lifetime,
-            confirm)) {
+        if (ssh_add_identity_constrained(ac, private, comment, lifetime,
+            confirm)) {
                 fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
                 ret = 0;
                 if (lifetime != 0)
                         fprintf(stderr,
                             "Lifetime set to %d seconds\n", lifetime);
-                if (confirm != 0)
+                if (confirm != 0)
                         fprintf(stderr,
                             "The user has to confirm each use of the key\n");
         } else if (ssh_add_identity(ac, private, comment)) {