- (djm) Stop shadow expiry checking from preventing logins with NIS. Based

[openssh.git] / ssh-agent.c

diff --git a/ssh-agent.c b/ssh-agent.c
index fb13ce7e19566b4f0cbfdaba27228788952919c0..7bfa290423bf1603e9255c60cd81fdeb4f5834fa 100644 (file)
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ssh-agent.c,v 1.30 2000/04/21 00:27:11 djm Exp $      */
+/*     $OpenBSD: ssh-agent.c,v 1.31 2000/04/29 18:11:52 markus Exp $   */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -9,7 +9,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.30 2000/04/21 00:27:11 djm Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.31 2000/04/29 18:11:52 markus Exp $");
 
 #include "ssh.h"
 #include "rsa.h"
@@ -55,7 +55,7 @@ char socket_dir[1024];
 #ifdef HAVE___PROGNAME
 extern char *__progname;
 #else /* HAVE___PROGNAME */
-const char *__progname = "ssh-agent";
+static const char *__progname = "ssh-agent";
 #endif /* HAVE___PROGNAME */
 
 void
@@ -178,7 +178,7 @@ process_remove_identity(SocketEntry *e)
        buffer_get_bignum(&e->input, n);
 
        if (bits != BN_num_bits(n))
-               error("Warning: identity keysize mismatch: actual %d, announced %d",
+               log("Warning: identity keysize mismatch: actual %d, announced %d",
                      BN_num_bits(n), bits);
 
        /* Check if we have the key. */
@@ -507,6 +507,7 @@ main(int ac, char **av)
        struct sockaddr_un sunaddr;
        pid_t pid;
        char *shell, *format, *pidstr, pidstrbuf[1 + 3 * sizeof pid];
+       extern int optind;
 
        /* check if RSA support exists */
        if (rsa_alive() == 0) {