2 files changed, 9 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 2ee8f40fc..9e64a40f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -58,6 +58,11 @@
    - deraadt@cvs.openbsd.org 2001/02/08 14:39:36
      [readconf.c]
      snprintf
+   - itojun@cvs.openbsd.org 2001/02/08 19:30:52
+     sync with netbsd tree changes.
+     - more strict prototypes, include necessary headers
+     - use paths.h/pathnames.h decls
+     - size_t typecase to int -> u_long
  - (bal) fixed sftp-client.c.  Return 'status' instead of '0'  
    (from the OpenBSD tree)
  - (bal) Synced ssh.1, ssh-add.1 and sshd.8 w/ OpenBSD
@@ -3845,4 +3850,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.730 2001/02/10 23:06:02 mouring Exp $
+$Id: ChangeLog,v 1.731 2001/02/10 23:13:41 mouring Exp $
diff --git a/ssh-agent.c b/ssh-agent.c
index c23d73b7e..7285096a4 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ssh-agent.c,v 1.49 2001/01/29 19:47:31 markus Exp $   */
+/*      $OpenBSD: ssh-agent.c,v 1.50 2001/02/08 19:30:52 itojun Exp $   */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.49 2001/01/29 19:47:31 markus Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.50 2001/02/08 19:30:52 itojun Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/md5.h>
@@ -705,7 +705,7 @@ cleanup_handler(int sig)
 }
 
 void
-usage()
+usage(void)
 {
         fprintf(stderr, "ssh-agent version %s\n", SSH_VERSION);
         fprintf(stderr, "Usage: %s [-c | -s] [-k] [command {args...]]\n",