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

[openssh.git] / sshconnect2.c

diff --git a/sshconnect2.c b/sshconnect2.c
index 378526bacd57dfc0ee2ee9104ce525fb121df99b..ed40a9d70cb49fe445687656ae28d2b2f3498ce0 100644 (file)
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.175 2009/11/20 00:59:36 dtucker Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.178 2010/01/11 04:46:45 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);
        }
@@ -1250,7 +1250,7 @@ load_identity_file(char *filename)
 {
        Key *private;
        char prompt[300], *passphrase;
-       int perm_ok, quit, i;
+       int perm_ok = 0, quit, i;
        struct stat st;
 
        if (stat(filename, &st) < 0) {
@@ -1589,7 +1589,7 @@ userauth_hostbased(Authctxt *authctxt)
        char *chost, *pkalg, *p, myname[NI_MAXHOST];
        const char *service;
        u_int blen, slen;
-       int ok, i, len, found = 0;
+       int ok, i, found = 0;
 
        /* check for a useful key */
        for (i = 0; i < sensitive->nkeys; i++) {
@@ -1626,7 +1626,6 @@ userauth_hostbased(Authctxt *authctxt)
                xfree(blob);
                return 0;
        }
-       len = strlen(p) + 2;
        xasprintf(&chost, "%s.", p);
        debug2("userauth_hostbased: chost %s", chost);
        xfree(p);