3 files changed, 14 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index 52b6650a6..aa8836e9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
    - markus@cvs.openbsd.org 2003/03/17 11:43:47
      [version.h]
      enter 3.6
+ - (bal) The days of lack of int64_t support are over.  Sorry kids.
 
 20030318
  - (tim) [configure.ac openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h]
@@ -1231,4 +1232,4 @@
      save auth method before monitor_reset_key_state(); bugzilla bug #284;
      ok provos@
 
-$Id: ChangeLog,v 1.2633 2003/03/19 23:11:34 djm Exp $
+$Id: ChangeLog,v 1.2633.2.1 2003/03/21 00:51:35 mouring Exp $
diff --git a/Makefile.in b/Makefile.in
index 350b417f1..b94eae158 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.227 2003/02/24 23:22:36 djm Exp $
+# $Id: Makefile.in,v 1.227.2.1 2003/03/21 00:51:35 mouring Exp $
 
 # uncomment if you run a non bourne compatable shell. Ie. csh
 #SHELL = @SH@
@@ -58,9 +58,7 @@ EXEEXT=@EXEEXT@
 INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@
 INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@
 
-@NO_SFTP@SFTP_PROGS=sftp-server$(EXEEXT) sftp$(EXEEXT)
-
-TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) ssh-rand-helper${EXEEXT} $(SFTP_PROGS)
+TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) ssh-rand-helper${EXEEXT} sftp-server$(EXEEXT) sftp$(EXEEXT)
 
 LIBSSH_OBJS=authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o \
         cipher.o compat.o compress.o crc32.o deattack.o fatal.o \
@@ -247,8 +245,8 @@ install-files: scard-install
                 $(INSTALL) -m 0755 $(STRIP_OPT) ssh-rand-helper $(DESTDIR)$(libexecdir)/ssh-rand-helper ; \
         fi
         $(INSTALL) -m 4711 $(STRIP_OPT) ssh-keysign $(DESTDIR)$(SSH_KEYSIGN)
-        @NO_SFTP@$(INSTALL) -m 0755 $(STRIP_OPT) sftp $(DESTDIR)$(bindir)/sftp
-        @NO_SFTP@$(INSTALL) -m 0755 $(STRIP_OPT) sftp-server $(DESTDIR)$(SFTP_SERVER)
+        $(INSTALL) -m 0755 $(STRIP_OPT) sftp $(DESTDIR)$(bindir)/sftp
+        $(INSTALL) -m 0755 $(STRIP_OPT) sftp-server $(DESTDIR)$(SFTP_SERVER)
         $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
         $(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
         $(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
@@ -261,8 +259,8 @@ install-files: scard-install
         if [ ! -z "$(INSTALL_SSH_RAND_HELPER)" ]; then \
                 $(INSTALL) -m 644 ssh-rand-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-rand-helper.8 ; \
         fi
-        @NO_SFTP@$(INSTALL) -m 644 sftp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1
-        @NO_SFTP@$(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
+        $(INSTALL) -m 644 sftp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1
+        $(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
         $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
         -rm -f $(DESTDIR)$(bindir)/slogin
         ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin
diff --git a/configure.ac b/configure.ac
index 83575758f..6f4bdacc4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.111 2003/03/18 18:21:41 tim Exp $
+# $Id: configure.ac,v 1.111.2.1 2003/03/21 00:51:35 mouring Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -1485,12 +1485,14 @@ fi
 
 AC_CHECK_TYPES(struct timespec)
 
-# If we don't have int64_t then we can't compile sftp-server.  So don't
-# even attempt to do it. 
+# We need int64_t or else certian parts of the compile will fail.
 if test "x$ac_cv_have_int64_t" = "xno" -a \
         "x$ac_cv_sizeof_long_int" != "x8" -a \
         "x$ac_cv_sizeof_long_long_int" = "x0" ; then
-        NO_SFTP='#'
+        echo "OpenSSH requires int64_t support.  Contact your vendor or install"
+        echo "an alternative compiler (I.E., GCC) before continuing."
+        echo ""
+        exit 1;
 else
 dnl test snprintf (broken on SCO w/gcc)
         AC_TRY_RUN(
@@ -1520,7 +1522,6 @@ main() { exit(0); }
                 ], [ true ], [ AC_DEFINE(BROKEN_SNPRINTF) ]
         )
 fi
-AC_SUBST(NO_SFTP)
 
 dnl Checks for structure members
 OSSH_CHECK_HEADER_FOR_FIELD(ut_host, utmp.h, HAVE_HOST_IN_UTMP)
@@ -2555,12 +2556,6 @@ if test "x$PAM_MSG" = "xyes" ; then
         echo ""
 fi
 
-if test ! -z "$NO_SFTP"; then
-        echo "sftp-server will be disabled.  Your compiler does not "
-        echo "support 64bit integers."
-        echo ""
-fi
-
 if test ! -z "$RAND_HELPER_CMDHASH" ; then
         echo "WARNING: you are using the builtin random number collection "
         echo "service. Please read WARNING.RNG and request that your OS "