- dtucker@cvs.openbsd.org 2009/12/06 23:41:15

     [sshconnect2.c]
     zap unused variable and strlen; from Steve McClellan, ok djm

diff --git a/ChangeLog b/ChangeLog
index 6d6dacd88259faddbcde8646e5028cb31e5f8577..bf909dc3d34967afbf33000e80e05acb76c9ae45 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -92,6 +92,9 @@
      make passing of zero-length arguments to ssh safe by
      passing "-<switch>" "<value>" rather than "-<switch><value>"
      ok dtucker@, guenther@, djm@
+   - dtucker@cvs.openbsd.org 2009/12/06 23:41:15
+     [sshconnect2.c]
+     zap unused variable and strlen; from Steve McClellan, ok djm
 
 20091226
  - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1

diff --git a/sshconnect2.c b/sshconnect2.c
index 378526bacd57dfc0ee2ee9104ce525fb121df99b..d428ac65f105ed06f71fcc57e0ed87035d081e39 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.176 2009/12/06 23:41:15 dtucker Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -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);