From: dtucker <dtucker>
Date: Fri, 8 Jan 2010 07:50:46 +0000 (+0000)
Subject:    - dtucker@cvs.openbsd.org 2009/12/06 23:41:15
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/87d8648154e2be94ac235b79b0cd9b7ec8596b44

   - 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 6d6dacd8..bf909dc3 100644
--- 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 378526ba..d428ac65 100644
--- 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);