summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-10-08 17:32:02 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-10-08 17:32:02 +1000
commit046dff2a07d63d41967d2e8b97c3d460336932a2 (patch)
treef40327eb44ca5c09f01f439d1f9a8d083cddda4f
parent89df7a3ecab70910fd745ddee01508f716255fb0 (diff)
- dtucker@cvs.openbsd.org 2003/10/07 01:47:27
[sshconnect2.c] Don't use logit for banner, since it truncates to MSGBUFSIZ; bz #668 & #707. ok markus@
-rw-r--r--ChangeLog9
-rw-r--r--sshconnect2.c5
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a1da45ed7..6c1edbd9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
120031008
2 - (dtucker) OpenBSD CVS Sync
3 - dtucker@cvs.openbsd.org 2003/10/07 01:47:27
4 [sshconnect2.c]
5 Don't use logit for banner, since it truncates to MSGBUFSIZ; bz #668 & #707.
6 ok markus@
7
120031007 820031007
2 - (djm) Delete autom4te.cache after autoreconf 9 - (djm) Delete autom4te.cache after autoreconf
3 - (dtucker) [auth-pam.c auth-pam.h session.c] Make PAM use the new static 10 - (dtucker) [auth-pam.c auth-pam.h session.c] Make PAM use the new static
@@ -1292,4 +1299,4 @@
1292 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1299 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1293 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1300 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1294 1301
1295$Id: ChangeLog,v 1.3063 2003/10/07 10:35:57 dtucker Exp $ 1302$Id: ChangeLog,v 1.3064 2003/10/08 07:32:02 dtucker Exp $
diff --git a/sshconnect2.c b/sshconnect2.c
index 933c223ec..4e3ae2de7 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: sshconnect2.c,v 1.124 2003/08/25 10:33:33 djm Exp $"); 26RCSID("$OpenBSD: sshconnect2.c,v 1.125 2003/10/07 01:47:27 dtucker Exp $");
27 27
28#include "openbsd-compat/sys-queue.h" 28#include "openbsd-compat/sys-queue.h"
29 29
@@ -361,7 +361,8 @@ input_userauth_banner(int type, u_int32_t seq, void *ctxt)
361 debug3("input_userauth_banner"); 361 debug3("input_userauth_banner");
362 msg = packet_get_string(NULL); 362 msg = packet_get_string(NULL);
363 lang = packet_get_string(NULL); 363 lang = packet_get_string(NULL);
364 logit("%s", msg); 364 if (options.log_level > SYSLOG_LEVEL_QUIET)
365 fprintf(stderr, "%s", msg);
365 xfree(msg); 366 xfree(msg);
366 xfree(lang); 367 xfree(lang);
367} 368}