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
     #556644).
   * Initialise sc to NULL in ssh_selinux_getctxbyname (thanks, Václav Ovsík;
     closes: #498684).
+  * Don't duplicate backslashes when displaying server banner (thanks,
+    Michał Górny; closes: #505378, LP: #425346).
 
  -- Colin Watson <cjwatson@debian.org>  Thu, 12 Nov 2009 21:31:44 +0000
 
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)
                 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);
         }