From c193d002cf1fa241b0a29c3de8814950c3eaaad1 Mon Sep 17 00:00:00 2001
From: djm <djm>
Date: Wed, 29 Nov 2000 00:56:35 +0000
Subject: [PATCH]  - (djm) bsd-rresvport.c bzero -> memset  - (djm) Don't fail
 in defines.h on absence of 64 bit types (we will    still fail during
 compilation of sftp-server).  - (djm) Fail if ar is not found during
 configure

---
 ChangeLog       | 4 ++++
 Makefile.in     | 2 +-
 bsd-rresvport.c | 2 +-
 configure.in    | 4 ++++
 defines.h       | 4 ----
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 09274116..a7abfd58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 20001129
  - (djm) Fix(?) the ssh hang-on-logout/data-from-child race
+ - (djm) bsd-rresvport.c bzero -> memset
+ - (djm) Don't fail in defines.h on absence of 64 bit types (we will 
+   still fail during compilation of sftp-server).
+ - (djm) Fail if ar is not found during configure
 
 20001125
  - (djm) Give up privs when reading seed file
diff --git a/Makefile.in b/Makefile.in
index 733f34e6..6588b1b9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -33,7 +33,7 @@ SSH_MODE= @SSHMODE@
 
 INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@
 
-TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) $(EXTRA_TARGETS)
+TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT)
 
 LIBSSH_OBJS=atomicio.o authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o cli.o compat.o compress.o crc32.o cygwin_util.o deattack.o dispatch.o hmac.o hostfile.o key.o kex.o log.o match.o mpaux.o nchan.o packet.o radix.o rijndael.o entropy.o readpass.o rsa.o ssh-dss.o ssh-rsa.o tildexpand.o ttymodes.o uidswap.o util.o uuencode.o xmalloc.o 
 
diff --git a/bsd-rresvport.c b/bsd-rresvport.c
index cda4c36a..e8f822bf 100644
--- a/bsd-rresvport.c
+++ b/bsd-rresvport.c
@@ -61,7 +61,7 @@ rresvport_af(int *alport, sa_family_t af)
 	int s;
 	int salen;
 
-	bzero(&ss, sizeof ss);
+	memset(&ss, '\0', sizeof ss);
 	sa = (struct sockaddr *)&ss;
 
 	switch (af) {
diff --git a/configure.in b/configure.in
index 3b3fcae1..01c54101 100644
--- a/configure.in
+++ b/configure.in
@@ -15,6 +15,10 @@ AC_PATH_PROG(ENT, ent)
 AC_SUBST(ENT)
 AC_PATH_PROGS(FILEPRIV, filepriv, true, /sbin:/usr/sbin)
 
+if test -z "$AR" ; then
+	AC_MSG_ERROR([*** 'ar' missing, please install or fix your \$PATH ***])
+fi
+
 # Use LOGIN_PROGRAM from environment if possible
 if test ! -z "$LOGIN_PROGRAM" ; then
 	AC_DEFINE_UNQUOTED(LOGIN_PROGRAM_FALLBACK, "$LOGIN_PROGRAM")
diff --git a/defines.h b/defines.h
index 3626bd90..642b0079 100644
--- a/defines.h
+++ b/defines.h
@@ -170,8 +170,6 @@ typedef long int int64_t;
 #  if (SIZEOF_LONG_LONG_INT == 8)
 typedef long long int int64_t;
 #   define HAVE_INTXX_T 1
-#  else
-#   error "64 bit int type not found."
 #  endif
 # endif
 #endif
@@ -182,8 +180,6 @@ typedef unsigned long int u_int64_t;
 #  if (SIZEOF_LONG_LONG_INT == 8)
 typedef unsigned long long int u_int64_t;
 #   define HAVE_U_INTXX_T 1
-#  else
-#   error "64 bit int type not found."
 #  endif
 # endif
 #endif
-- 
2.45.2