summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-10-08 17:31:17 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-10-08 17:31:17 +1000
commit625a6e3fa803d028c4256795d6a0e6192dd8496c (patch)
treed0ff0a4957c53c3a1e5c8044eb3ec418132b1850
parentf9c781912672ce03ee870c2132c2ba0d0681afa3 (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 73f6f53f..a00bfdce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20031008
+ - (dtucker) OpenBSD CVS Sync
+ - 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@
+
20031007
- (dtucker) [contrib/redhat/openssh.spec] Bug #714: Now that UsePAM is a
run-time switch, always build --with-md5-passwords.
@@ -1215,4 +1222,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.42 2003/10/07 10:35:29 dtucker Exp $
+$Id: ChangeLog,v 1.2994.2.43 2003/10/08 07:31:17 dtucker Exp $
diff --git a/sshconnect2.c b/sshconnect2.c
index 933c223e..4e3ae2de 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshconnect2.c,v 1.124 2003/08/25 10:33:33 djm Exp $");
+RCSID("$OpenBSD: sshconnect2.c,v 1.125 2003/10/07 01:47:27 dtucker Exp $");
#include "openbsd-compat/sys-queue.h"
@@ -361,7 +361,8 @@ input_userauth_banner(int type, u_int32_t seq, void *ctxt)
debug3("input_userauth_banner");
msg = packet_get_string(NULL);
lang = packet_get_string(NULL);
- logit("%s", msg);
+ if (options.log_level > SYSLOG_LEVEL_QUIET)
+ fprintf(stderr, "%s", msg);
xfree(msg);
xfree(lang);
}