summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2010-01-02 01:06:25 +0000
committerColin Watson <cjwatson@debian.org>2010-01-02 01:06:25 +0000
commit4f3c4b6584fb9f942ea27b601e3b58e316b999a1 (patch)
treee755207842e84b74a3cf9a7c93e75a514fbfe11c
parentdcb1c932a27f8b4dbc1de7ecd2567c0b59f3cbb4 (diff)
Don't duplicate backslashes when displaying server banner (thanks,
Michał Górny; closes: #505378, LP: #425346).
-rw-r--r--debian/changelog2
-rw-r--r--sshconnect2.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 5fbc487b5..56f4b6f9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,8 @@ openssh (1:5.2p1-1) UNRELEASED; urgency=low
37 #556644). 37 #556644).
38 * Initialise sc to NULL in ssh_selinux_getctxbyname (thanks, Václav Ovsík; 38 * Initialise sc to NULL in ssh_selinux_getctxbyname (thanks, Václav Ovsík;
39 closes: #498684). 39 closes: #498684).
40 * Don't duplicate backslashes when displaying server banner (thanks,
41 Michał Górny; closes: #505378, LP: #425346).
40 42
41 -- Colin Watson <cjwatson@debian.org> Thu, 12 Nov 2009 21:31:44 +0000 43 -- Colin Watson <cjwatson@debian.org> Thu, 12 Nov 2009 21:31:44 +0000
42 44
diff --git a/sshconnect2.c b/sshconnect2.c
index bb72db5dd..233d91f5e 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -474,7 +474,7 @@ input_userauth_banner(int type, u_int32_t seq, void *ctxt)
474 if (len > 65536) 474 if (len > 65536)
475 len = 65536; 475 len = 65536;
476 msg = xmalloc(len * 4 + 1); /* max expansion from strnvis() */ 476 msg = xmalloc(len * 4 + 1); /* max expansion from strnvis() */
477 strnvis(msg, raw, len * 4 + 1, VIS_SAFE|VIS_OCTAL); 477 strnvis(msg, raw, len * 4 + 1, VIS_SAFE|VIS_OCTAL|VIS_NOSLASH);
478 fprintf(stderr, "%s", msg); 478 fprintf(stderr, "%s", msg);
479 xfree(msg); 479 xfree(msg);
480 } 480 }