summaryrefslogtreecommitdiff
path: root/canohost.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2014-01-19 15:30:02 +1100
committerDarren Tucker <dtucker@zip.com.au>2014-01-19 15:30:02 +1100
commit7b1ded04adce42efa25ada7c3a39818d3109b724 (patch)
tree38d0d51c0301411e9dfecd9c2024b48dde99a10b /canohost.c
parent293ee3c9f0796d99ebb033735f0e315f2e0180bf (diff)
- dtucker@cvs.openbsd.org 2014/01/19 04:17:29
[canohost.c addrmatch.c] Cast socklen_t when comparing to size_t and use socklen_t to iterate over the ip options, both to prevent signed/unsigned comparison warnings. Patch from vinschen at redhat via portable openssh, begrudging ok deraadt.
Diffstat (limited to 'canohost.c')
-rw-r--r--canohost.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/canohost.c b/canohost.c
index 2e5a0b86..a19a60cd 100644
--- a/canohost.c
+++ b/canohost.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: canohost.c,v 1.69 2013/11/20 20:54:10 deraadt Exp $ */
+/* $OpenBSD: canohost.c,v 1.70 2014/01/19 04:17:29 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -154,8 +154,7 @@ check_ip_options(int sock, char *ipaddr)
#ifdef IP_OPTIONS
u_char options[200];
char text[sizeof(options) * 3 + 1];
- socklen_t option_size;
- u_int i;
+ socklen_t option_size, i;
int ipproto;
struct protoent *ip;