- djm@cvs.openbsd.org 2009/11/20 00:54:01

[openssh.git] / ssh-add.c

diff --git a/ssh-add.c b/ssh-add.c
index eccc8ce45115f3a992b6b7d62f09e5d87086018c..084478d78c6d98875225379c1c513dbc447dd17c 100644 (file)
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-add.c,v 1.87 2006/07/26 13:57:17 stevesk Exp $ */
+/* $OpenBSD: ssh-add.c,v 1.91 2009/08/27 17:44:52 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -42,18 +42,22 @@
 #include <sys/param.h>
 
 #include <openssl/evp.h>
+#include "openbsd-compat/openssl-compat.h"
 
 #include <fcntl.h>
 #include <pwd.h>
+#include <stdarg.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#include "xmalloc.h"
 #include "ssh.h"
 #include "rsa.h"
 #include "log.h"
-#include "xmalloc.h"
 #include "key.h"
+#include "buffer.h"
 #include "authfd.h"
 #include "authfile.h"
 #include "pathnames.h"
@@ -191,9 +195,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);
        }
@@ -306,7 +307,7 @@ do_file(AuthenticationConnection *ac, int deleting, char *file)
 static void
 usage(void)
 {
-       fprintf(stderr, "Usage: %s [options] [file ...]\n", __progname);
+       fprintf(stderr, "usage: %s [options] [file ...]\n", __progname);
        fprintf(stderr, "Options:\n");
        fprintf(stderr, "  -l          List fingerprints of all identities.\n");
        fprintf(stderr, "  -L          List public key parameters of all identities.\n");