From eab4bae03894f07ea556db4d781795c724245af7 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 29 Apr 2003 23:22:40 +1000 Subject: - (djm) Add back radix.o (used by AFS support), after it went missing from Makefile many moons ago - (djm) Apply "owl-always-auth" patch from Openwall/Solar Designer - (djm) Fix blibpath specification for AIX/gcc - (djm) Some systems have basename in -lgen. Fix from ayamura@ayamura.org --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'version.h') diff --git a/version.h b/version.h index 75a2b2554..3b2a35d91 100644 --- a/version.h +++ b/version.h @@ -1,3 +1,3 @@ /* $OpenBSD: version.h,v 1.37 2003/04/01 10:56:46 markus Exp $ */ -#define SSH_VERSION "OpenSSH_3.6.1p1" +#define SSH_VERSION "OpenSSH_3.6.1p2" -- cgit v1.2.3 From f117f877b1829ecbc2376c2302d14c22c25acc6f Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 3 Sep 2003 12:12:54 +1000 Subject: - markus@cvs.openbsd.org 2003/09/02 16:40:29 [version.h] enter 3.7 --- ChangeLog | 5 ++++- version.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'version.h') diff --git a/ChangeLog b/ChangeLog index c62cf5fea..e9de01fe6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,9 @@ [auth.h] remove kerberos support from ssh1, since it has been replaced with GSSAPI; but keep kerberos passwd auth for ssh1 and 2; ok djm, hin, henning, ... + - markus@cvs.openbsd.org 2003/09/02 16:40:29 + [version.h] + enter 3.7 20030902 - (djm) OpenBSD CVS Sync @@ -980,4 +983,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.2939 2003/09/03 02:11:30 djm Exp $ +$Id: ChangeLog,v 1.2940 2003/09/03 02:12:54 djm Exp $ diff --git a/version.h b/version.h index 3b2a35d91..37e0c22ab 100644 --- a/version.h +++ b/version.h @@ -1,3 +1,3 @@ /* $OpenBSD: version.h,v 1.37 2003/04/01 10:56:46 markus Exp $ */ -#define SSH_VERSION "OpenSSH_3.6.1p2" +#define SSH_VERSION "OpenSSH_3.7p1" -- cgit v1.2.3 From 92dc672aac7e659192a8eb0ee401e81ce63e48b2 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 17 Sep 2003 07:34:12 +1000 Subject: - (djm) OpenBSD Sync - markus@cvs.openbsd.org 2003/09/16 21:02:40 [buffer.c channels.c version.h] more malloc/fatal fixes; ok millert/deraadt; ghudson at MIT.EDU --- ChangeLog | 8 +++++++- buffer.c | 15 ++++++++++----- channels.c | 7 ++++--- version.h | 4 ++-- 4 files changed, 23 insertions(+), 11 deletions(-) (limited to 'version.h') diff --git a/ChangeLog b/ChangeLog index b5505da19..8093c7abd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +20030917 + - (djm) OpenBSD Sync + - markus@cvs.openbsd.org 2003/09/16 21:02:40 + [buffer.c channels.c version.h] + more malloc/fatal fixes; ok millert/deraadt; ghudson at MIT.EDU + 20030916 - (dtucker) [acconfig.h configure.ac defines.h session.c] Bug #252: Retrieve PATH (or SUPATH) and UMASK from /etc/default/login on platforms that have it @@ -1107,4 +1113,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.2994.2.4 2003/09/16 06:00:52 djm Exp $ +$Id: ChangeLog,v 1.2994.2.5 2003/09/16 21:34:12 djm Exp $ diff --git a/buffer.c b/buffer.c index 8ff8c2f48..aee293f8b 100644 --- a/buffer.c +++ b/buffer.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: buffer.c,v 1.17 2003/09/16 03:03:47 deraadt Exp $"); +RCSID("$OpenBSD: buffer.c,v 1.18 2003/09/16 21:02:39 markus Exp $"); #include "xmalloc.h" #include "buffer.h" @@ -23,8 +23,11 @@ RCSID("$OpenBSD: buffer.c,v 1.17 2003/09/16 03:03:47 deraadt Exp $"); void buffer_init(Buffer *buffer) { - buffer->alloc = 4096; - buffer->buf = xmalloc(buffer->alloc); + const u_int len = 4096; + + buffer->alloc = 0; + buffer->buf = xmalloc(len); + buffer->alloc = len; buffer->offset = 0; buffer->end = 0; } @@ -34,8 +37,10 @@ buffer_init(Buffer *buffer) void buffer_free(Buffer *buffer) { - memset(buffer->buf, 0, buffer->alloc); - xfree(buffer->buf); + if (buffer->alloc > 0) { + memset(buffer->buf, 0, buffer->alloc); + xfree(buffer->buf); + } } /* diff --git a/channels.c b/channels.c index 65a6a7f00..3d75c8f2b 100644 --- a/channels.c +++ b/channels.c @@ -39,7 +39,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: channels.c,v 1.194 2003/08/29 10:04:36 markus Exp $"); +RCSID("$OpenBSD: channels.c,v 1.195 2003/09/16 21:02:40 markus Exp $"); #include "ssh.h" #include "ssh1.h" @@ -229,12 +229,13 @@ channel_new(char *ctype, int type, int rfd, int wfd, int efd, if (found == -1) { /* There are no free slots. Take last+1 slot and expand the array. */ found = channels_alloc; - channels_alloc += 10; if (channels_alloc > 10000) fatal("channel_new: internal error: channels_alloc %d " "too big.", channels_alloc); + channels = xrealloc(channels, + (channels_alloc + 10) * sizeof(Channel *)); + channels_alloc += 10; debug2("channel: expanding %d", channels_alloc); - channels = xrealloc(channels, channels_alloc * sizeof(Channel *)); for (i = found; i < channels_alloc; i++) channels[i] = NULL; } diff --git a/version.h b/version.h index 37e0c22ab..20daac42a 100644 --- a/version.h +++ b/version.h @@ -1,3 +1,3 @@ -/* $OpenBSD: version.h,v 1.37 2003/04/01 10:56:46 markus Exp $ */ +/* $OpenBSD: version.h,v 1.39 2003/09/16 21:02:40 markus Exp $ */ -#define SSH_VERSION "OpenSSH_3.7p1" +#define SSH_VERSION "OpenSSH_3.7.1p1" -- cgit v1.2.3 From b5f8e5d4c6e0c65e6f112bd702acd2039f9d2d4d Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 23 Sep 2003 19:26:51 +1000 Subject: - (djm) Crank version.h and spec version numbers --- ChangeLog | 3 ++- contrib/caldera/openssh.spec | 4 ++-- contrib/redhat/openssh.spec | 2 +- contrib/suse/openssh.spec | 2 +- version.h | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) (limited to 'version.h') diff --git a/ChangeLog b/ChangeLog index 9b34d4a6e..756b67fd4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ - (djm) Enable build with old OpenSSL again - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu + - (djm) Crank version.h and spec version numbers 20030922 - (dtucker) [Makefile.in] Bug #644: Fix "make clean" for out-of-tree @@ -1186,4 +1187,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.2994.2.32 2003/09/23 09:24:21 djm Exp $ +$Id: ChangeLog,v 1.2994.2.33 2003/09/23 09:26:51 djm Exp $ diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index 7870639fe..c58b1d4ff 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec @@ -17,7 +17,7 @@ #old cvs stuff. please update before use. may be deprecated. %define use_stable 1 %if %{use_stable} - %define version 3.7.1p1 + %define version 3.7.1p2 %define cvs %{nil} %define release 1 %else @@ -364,4 +364,4 @@ fi * Mon Jan 01 1998 ... Template Version: 1.31 -$Id: openssh.spec,v 1.43.2.3 2003/09/16 21:35:10 djm Exp $ +$Id: openssh.spec,v 1.43.2.4 2003/09/23 09:26:52 djm Exp $ diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index b65f37839..20ccb6fac 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -1,4 +1,4 @@ -%define ver 3.7.1p1 +%define ver 3.7.1p2 %define rel 1 # OpenSSH privilege separation requires a user & group ID diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec index be6971d6e..940bc4ade 100644 --- a/contrib/suse/openssh.spec +++ b/contrib/suse/openssh.spec @@ -1,6 +1,6 @@ Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation Name: openssh -Version: 3.7.1p1 +Version: 3.7.1p2 URL: http://www.openssh.com/ Release: 1 Source0: openssh-%{version}.tar.gz diff --git a/version.h b/version.h index 20daac42a..0a98e4290 100644 --- a/version.h +++ b/version.h @@ -1,3 +1,3 @@ /* $OpenBSD: version.h,v 1.39 2003/09/16 21:02:40 markus Exp $ */ -#define SSH_VERSION "OpenSSH_3.7.1p1" +#define SSH_VERSION "OpenSSH_3.7.1p2" -- cgit v1.2.3