- djm@cvs.openbsd.org 2008/07/17 08:48:00

[sshconnect2.c]
     strnvis preauth banner; pointed out by mpf@ ok markus@
This commit is contained in:
Damien Miller 2008-07-17 18:57:06 +10:00
parent 6ef17495e9
commit 7ba0ca7f6f
2 changed files with 20 additions and 6 deletions

View File

@ -1,3 +1,9 @@
20080717
- (djm) OpenBSD CVS Sync
- djm@cvs.openbsd.org 2008/07/17 08:48:00
[sshconnect2.c]
strnvis preauth banner; pointed out by mpf@ ok markus@
20080716
- OpenBSD CVS Sync
- djm@cvs.openbsd.org 2008/07/15 02:23:14
@ -4684,4 +4690,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.5087 2008/07/16 12:42:06 djm Exp $
$Id: ChangeLog,v 1.5088 2008/07/17 08:57:06 djm Exp $

View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshconnect2.c,v 1.165 2008/01/19 23:09:49 djm Exp $ */
/* $OpenBSD: sshconnect2.c,v 1.166 2008/07/17 08:48:00 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@ -38,6 +38,7 @@
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <vis.h>
#include "openbsd-compat/sys-queue.h"
@ -374,14 +375,21 @@ input_userauth_error(int type, u_int32_t seq, void *ctxt)
void
input_userauth_banner(int type, u_int32_t seq, void *ctxt)
{
char *msg, *lang;
char *msg, *raw, *lang;
u_int len;
debug3("input_userauth_banner");
msg = packet_get_string(NULL);
raw = packet_get_string(&len);
lang = packet_get_string(NULL);
if (options.log_level >= SYSLOG_LEVEL_INFO)
if (options.log_level >= SYSLOG_LEVEL_INFO) {
if (len > 65536)
len = 65536;
msg = xmalloc(len * 4); /* max expansion from strnvis() */
strnvis(msg, raw, len * 4, VIS_SAFE|VIS_OCTAL);
fprintf(stderr, "%s", msg);
xfree(msg);
xfree(msg);
}
xfree(raw);
xfree(lang);
}