summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Makefile.in14
-rw-r--r--configure.ac17
3 files changed, 14 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index 52b6650a6..d35c4e42e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
6 - markus@cvs.openbsd.org 2003/03/17 11:43:47 6 - markus@cvs.openbsd.org 2003/03/17 11:43:47
7 [version.h] 7 [version.h]
8 enter 3.6 8 enter 3.6
9 - (bal) The days of lack of int64_t support are over. Sorry kids.
9 10
1020030318 1120030318
11 - (tim) [configure.ac openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h] 12 - (tim) [configure.ac openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h]
@@ -1231,4 +1232,4 @@
1231 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1232 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1232 ok provos@ 1233 ok provos@
1233 1234
1234$Id: ChangeLog,v 1.2633 2003/03/19 23:11:34 djm Exp $ 1235$Id: ChangeLog,v 1.2634 2003/03/21 00:34:34 mouring Exp $
diff --git a/Makefile.in b/Makefile.in
index 350b417f1..6702eb96e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.227 2003/02/24 23:22:36 djm Exp $ 1# $Id: Makefile.in,v 1.228 2003/03/21 00:34:34 mouring Exp $
2 2
3# uncomment if you run a non bourne compatable shell. Ie. csh 3# uncomment if you run a non bourne compatable shell. Ie. csh
4#SHELL = @SH@ 4#SHELL = @SH@
@@ -58,9 +58,7 @@ EXEEXT=@EXEEXT@
58INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@ 58INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@
59INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@ 59INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@
60 60
61@NO_SFTP@SFTP_PROGS=sftp-server$(EXEEXT) sftp$(EXEEXT) 61TARGETS=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)
62
63TARGETS=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)
64 62
65LIBSSH_OBJS=authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o \ 63LIBSSH_OBJS=authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o \
66 cipher.o compat.o compress.o crc32.o deattack.o fatal.o \ 64 cipher.o compat.o compress.o crc32.o deattack.o fatal.o \
@@ -247,8 +245,8 @@ install-files: scard-install
247 $(INSTALL) -m 0755 $(STRIP_OPT) ssh-rand-helper $(DESTDIR)$(libexecdir)/ssh-rand-helper ; \ 245 $(INSTALL) -m 0755 $(STRIP_OPT) ssh-rand-helper $(DESTDIR)$(libexecdir)/ssh-rand-helper ; \
248 fi 246 fi
249 $(INSTALL) -m 4711 $(STRIP_OPT) ssh-keysign $(DESTDIR)$(SSH_KEYSIGN) 247 $(INSTALL) -m 4711 $(STRIP_OPT) ssh-keysign $(DESTDIR)$(SSH_KEYSIGN)
250 @NO_SFTP@$(INSTALL) -m 0755 $(STRIP_OPT) sftp $(DESTDIR)$(bindir)/sftp 248 $(INSTALL) -m 0755 $(STRIP_OPT) sftp $(DESTDIR)$(bindir)/sftp
251 @NO_SFTP@$(INSTALL) -m 0755 $(STRIP_OPT) sftp-server $(DESTDIR)$(SFTP_SERVER) 249 $(INSTALL) -m 0755 $(STRIP_OPT) sftp-server $(DESTDIR)$(SFTP_SERVER)
252 $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 250 $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
253 $(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 251 $(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
254 $(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 252 $(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
@@ -261,8 +259,8 @@ install-files: scard-install
261 if [ ! -z "$(INSTALL_SSH_RAND_HELPER)" ]; then \ 259 if [ ! -z "$(INSTALL_SSH_RAND_HELPER)" ]; then \
262 $(INSTALL) -m 644 ssh-rand-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-rand-helper.8 ; \ 260 $(INSTALL) -m 644 ssh-rand-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-rand-helper.8 ; \
263 fi 261 fi
264 @NO_SFTP@$(INSTALL) -m 644 sftp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1 262 $(INSTALL) -m 644 sftp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1
265 @NO_SFTP@$(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 263 $(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
266 $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 264 $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
267 -rm -f $(DESTDIR)$(bindir)/slogin 265 -rm -f $(DESTDIR)$(bindir)/slogin
268 ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin 266 ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin
diff --git a/configure.ac b/configure.ac
index 83575758f..aa2f3db2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.111 2003/03/18 18:21:41 tim Exp $ 1# $Id: configure.ac,v 1.112 2003/03/21 00:34:34 mouring Exp $
2 2
3AC_INIT 3AC_INIT
4AC_CONFIG_SRCDIR([ssh.c]) 4AC_CONFIG_SRCDIR([ssh.c])
@@ -1485,12 +1485,14 @@ fi
1485 1485
1486AC_CHECK_TYPES(struct timespec) 1486AC_CHECK_TYPES(struct timespec)
1487 1487
1488# If we don't have int64_t then we can't compile sftp-server. So don't 1488# We need int64_t or else certian parts of the compile will fail.
1489# even attempt to do it.
1490if test "x$ac_cv_have_int64_t" = "xno" -a \ 1489if test "x$ac_cv_have_int64_t" = "xno" -a \
1491 "x$ac_cv_sizeof_long_int" != "x8" -a \ 1490 "x$ac_cv_sizeof_long_int" != "x8" -a \
1492 "x$ac_cv_sizeof_long_long_int" = "x0" ; then 1491 "x$ac_cv_sizeof_long_long_int" = "x0" ; then
1493 NO_SFTP='#' 1492 echo "OpenSSH requires int64_t support. Contact your vendor or install"
1493 echo "an alternative compiler (I.E., GCC) before continuing."
1494 echo ""
1495 exit 1;
1494else 1496else
1495dnl test snprintf (broken on SCO w/gcc) 1497dnl test snprintf (broken on SCO w/gcc)
1496 AC_TRY_RUN( 1498 AC_TRY_RUN(
@@ -1520,7 +1522,6 @@ main() { exit(0); }
1520 ], [ true ], [ AC_DEFINE(BROKEN_SNPRINTF) ] 1522 ], [ true ], [ AC_DEFINE(BROKEN_SNPRINTF) ]
1521 ) 1523 )
1522fi 1524fi
1523AC_SUBST(NO_SFTP)
1524 1525
1525dnl Checks for structure members 1526dnl Checks for structure members
1526OSSH_CHECK_HEADER_FOR_FIELD(ut_host, utmp.h, HAVE_HOST_IN_UTMP) 1527OSSH_CHECK_HEADER_FOR_FIELD(ut_host, utmp.h, HAVE_HOST_IN_UTMP)
@@ -2555,12 +2556,6 @@ if test "x$PAM_MSG" = "xyes" ; then
2555 echo "" 2556 echo ""
2556fi 2557fi
2557 2558
2558if test ! -z "$NO_SFTP"; then
2559 echo "sftp-server will be disabled. Your compiler does not "
2560 echo "support 64bit integers."
2561 echo ""
2562fi
2563
2564if test ! -z "$RAND_HELPER_CMDHASH" ; then 2559if test ! -z "$RAND_HELPER_CMDHASH" ; then
2565 echo "WARNING: you are using the builtin random number collection " 2560 echo "WARNING: you are using the builtin random number collection "
2566 echo "service. Please read WARNING.RNG and request that your OS " 2561 echo "service. Please read WARNING.RNG and request that your OS "