- dtucker@cvs.openbsd.org 2010/01/04 01:45:30

     [sshconnect2.c]
     Don't escape backslashes in the SSH2 banner.  bz#1533, patch from
     Michal Gorny via Gentoo.

diff --git a/ChangeLog b/ChangeLog
index 929907961a85059aaab2b8db3fe6db4aecca0411..ac3ca7b023920203626eb78b19b423cd54330323 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -137,6 +137,10 @@
    - jmc@cvs.openbsd.org 2009/12/29 18:03:32
      [sshd_config.5 ssh_config.5]
      sort previous;
+   - dtucker@cvs.openbsd.org 2010/01/04 01:45:30
+     [sshconnect2.c]
+     Don't escape backslashes in the SSH2 banner.  bz#1533, patch from
+     Michal Gorny via Gentoo.
 
 20091226
  - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1

diff --git a/sshconnect2.c b/sshconnect2.c
index d428ac65f105ed06f71fcc57e0ed87035d081e39..367f0fc6c9f4670e9cc72ad98d12f325af5b5988 100644 (file)
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.176 2009/12/06 23:41:15 dtucker Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.177 2010/01/04 01:45:30 dtucker Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -421,7 +421,7 @@ input_userauth_banner(int type, u_int32_t seq, void *ctxt)
                if (len > 65536)
                        len = 65536;
                msg = xmalloc(len * 4 + 1); /* max expansion from strnvis() */
-               strnvis(msg, raw, len * 4 + 1, VIS_SAFE|VIS_OCTAL);
+               strnvis(msg, raw, len * 4 + 1, VIS_SAFE|VIS_OCTAL|VIS_NOSLASH);
                fprintf(stderr, "%s", msg);
                xfree(msg);
        }