- (djm) Fix a few warnings the above turned up

[openssh.git] / ssh-add.c

diff --git a/ssh-add.c b/ssh-add.c
index cf181ca467826ab031fa6e1ebef8af8b16fdcc48..84a8c20f9648da4debd6bc75318545c5fee47237 100644 (file)
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-add.c,v 1.37 2001/05/02 16:41:20 markus Exp $");
+RCSID("$OpenBSD: ssh-add.c,v 1.40 2001/06/24 05:35:33 markus Exp $");
 
 #include <openssl/evp.h>
 
@@ -57,7 +57,7 @@ char *__progname;
 
 /* we keep a cache of one passphrases */
 static char *pass = NULL;
-void
+static void
 clear_pass(void)
 {
        if (pass) {
@@ -67,7 +67,7 @@ clear_pass(void)
        }
 }
 
-void
+static void
 delete_file(AuthenticationConnection *ac, const char *filename)
 {
        Key *public;
@@ -87,7 +87,7 @@ delete_file(AuthenticationConnection *ac, const char *filename)
 }
 
 /* Send a request to remove all identities. */
-void
+static void
 delete_all(AuthenticationConnection *ac)
 {
        int success = 1;
@@ -103,7 +103,7 @@ delete_all(AuthenticationConnection *ac)
                fprintf(stderr, "Failed to remove all identities.\n");
 }
 
-void
+static void
 add_file(AuthenticationConnection *ac, const char *filename)
 {
        struct stat st;
@@ -125,11 +125,10 @@ add_file(AuthenticationConnection *ac, const char *filename)
        if (private == NULL) {
                /* clear passphrase since it did not work */
                clear_pass();
-               printf("Need passphrase for %.200s\n", filename);
                snprintf(msg, sizeof msg, "Enter passphrase for %.200s: ",
                   comment);
                for (;;) {
-                       pass = read_passphrase(msg, 1);
+                       pass = read_passphrase(msg, RP_ALLOW_STDIN);
                        if (strcmp(pass, "") == 0) {
                                clear_pass();
                                xfree(comment);
@@ -150,7 +149,7 @@ add_file(AuthenticationConnection *ac, const char *filename)
        key_free(private);
 }
 
-void
+static void
 list_identities(AuthenticationConnection *ac, int do_fp)
 {
        Key *key;