diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | sshconnect2.c | 4 |
2 files changed, 7 insertions, 3 deletions
@@ -11,6 +11,10 @@ | |||
11 | [key.c] | 11 | [key.c] |
12 | In random art visualization, make sure to use the end marker only at the | 12 | In random art visualization, make sure to use the end marker only at the |
13 | end. Initial diff by Dirk Loss, tweaks and ok djm@ | 13 | end. Initial diff by Dirk Loss, tweaks and ok djm@ |
14 | - markus@cvs.openbsd.org 2008/07/31 14:48:28 | ||
15 | [sshconnect2.c] | ||
16 | don't allocate space for empty banners; report t8m at centrum.cz; | ||
17 | ok deraadt | ||
14 | 18 | ||
15 | 20080906 | 19 | 20080906 |
16 | - (dtucker) [config.guess config.sub] Update to latest versions from | 20 | - (dtucker) [config.guess config.sub] Update to latest versions from |
@@ -4745,4 +4749,4 @@ | |||
4745 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4749 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4746 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4750 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4747 | 4751 | ||
4748 | $Id: ChangeLog,v 1.5101 2008/11/03 08:16:20 djm Exp $ | 4752 | $Id: ChangeLog,v 1.5102 2008/11/03 08:17:08 djm Exp $ |
diff --git a/sshconnect2.c b/sshconnect2.c index 389bec9e4..1a8f39071 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.166 2008/07/17 08:48:00 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.167 2008/07/31 14:48:28 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -383,7 +383,7 @@ input_userauth_banner(int type, u_int32_t seq, void *ctxt) | |||
383 | debug3("input_userauth_banner"); | 383 | debug3("input_userauth_banner"); |
384 | raw = packet_get_string(&len); | 384 | raw = packet_get_string(&len); |
385 | lang = packet_get_string(NULL); | 385 | lang = packet_get_string(NULL); |
386 | if (options.log_level >= SYSLOG_LEVEL_INFO) { | 386 | if (len > 0 && options.log_level >= SYSLOG_LEVEL_INFO) { |
387 | if (len > 65536) | 387 | if (len > 65536) |
388 | len = 65536; | 388 | len = 65536; |
389 | msg = xmalloc(len * 4); /* max expansion from strnvis() */ | 389 | msg = xmalloc(len * 4); /* max expansion from strnvis() */ |