- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / ssh-add.c

diff --git a/ssh-add.c b/ssh-add.c
index 2944cceebe824f4bbf924b8debfee6dc124f6152..084478d78c6d98875225379c1c513dbc447dd17c 100644 (file)
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,3 +1,4 @@
+/* $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
@@ -38,14 +39,25 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#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"
@@ -131,7 +143,7 @@ add_file(AuthenticationConnection *ac, const char *filename)
        char msg[1024];
        int fd, perms_ok, ret = -1;
 
-       if ((fd = open(filename, 0)) < 0) {
+       if ((fd = open(filename, O_RDONLY)) < 0) {
                perror(filename);
                return -1;
        }
@@ -183,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);
        }
@@ -298,7 +307,7 @@ do_file(AuthenticationConnection *ac, int deleting, char *file)
 static void
 usage(void)
 {
-       fprintf(stderr, "Usage: %s [options]\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");