diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | sshconnect2.c | 5 |
2 files changed, 5 insertions, 3 deletions
@@ -92,6 +92,9 @@ | |||
92 | make passing of zero-length arguments to ssh safe by | 92 | make passing of zero-length arguments to ssh safe by |
93 | passing "-<switch>" "<value>" rather than "-<switch><value>" | 93 | passing "-<switch>" "<value>" rather than "-<switch><value>" |
94 | ok dtucker@, guenther@, djm@ | 94 | ok dtucker@, guenther@, djm@ |
95 | - dtucker@cvs.openbsd.org 2009/12/06 23:41:15 | ||
96 | [sshconnect2.c] | ||
97 | zap unused variable and strlen; from Steve McClellan, ok djm | ||
95 | 98 | ||
96 | 20091226 | 99 | 20091226 |
97 | - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1 | 100 | - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1 |
diff --git a/sshconnect2.c b/sshconnect2.c index 378526bac..d428ac65f 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.175 2009/11/20 00:59:36 dtucker Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.176 2009/12/06 23:41:15 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
@@ -1589,7 +1589,7 @@ userauth_hostbased(Authctxt *authctxt) | |||
1589 | char *chost, *pkalg, *p, myname[NI_MAXHOST]; | 1589 | char *chost, *pkalg, *p, myname[NI_MAXHOST]; |
1590 | const char *service; | 1590 | const char *service; |
1591 | u_int blen, slen; | 1591 | u_int blen, slen; |
1592 | int ok, i, len, found = 0; | 1592 | int ok, i, found = 0; |
1593 | 1593 | ||
1594 | /* check for a useful key */ | 1594 | /* check for a useful key */ |
1595 | for (i = 0; i < sensitive->nkeys; i++) { | 1595 | for (i = 0; i < sensitive->nkeys; i++) { |
@@ -1626,7 +1626,6 @@ userauth_hostbased(Authctxt *authctxt) | |||
1626 | xfree(blob); | 1626 | xfree(blob); |
1627 | return 0; | 1627 | return 0; |
1628 | } | 1628 | } |
1629 | len = strlen(p) + 2; | ||
1630 | xasprintf(&chost, "%s.", p); | 1629 | xasprintf(&chost, "%s.", p); |
1631 | debug2("userauth_hostbased: chost %s", chost); | 1630 | debug2("userauth_hostbased: chost %s", chost); |
1632 | xfree(p); | 1631 | xfree(p); |