diff options
| author | cy <cy@FreeBSD.org> | 2014-07-12 05:59:19 +0000 |
|---|---|---|
| committer | cy <cy@FreeBSD.org> | 2014-07-12 05:59:19 +0000 |
| commit | 6674c38744967143238448e3b5f6ab7dce2999c6 (patch) | |
| tree | a81ff1ff2836a79b1136d67566c26e804567999d /contrib/ipfilter | |
| parent | fe5b2cf89fbe6cf353aa17edbcf58016d6c79e37 (diff) | |
| download | FreeBSD-src-6674c38744967143238448e3b5f6ab7dce2999c6.zip FreeBSD-src-6674c38744967143238448e3b5f6ab7dce2999c6.tar.gz | |
MFC r268286: Fix compile-time errors when NO_WERROR and WITHOUT_INET6_SUPPORT
(NO_INET6) are specified.
Approved by: glebius (mentor)
Diffstat (limited to 'contrib/ipfilter')
| -rw-r--r-- | contrib/ipfilter/lib/printhost.c | 2 | ||||
| -rw-r--r-- | contrib/ipfilter/lib/printhostmask.c | 2 | ||||
| -rw-r--r-- | contrib/ipfilter/lib/save_v1trap.c | 2 | ||||
| -rw-r--r-- | contrib/ipfilter/lib/save_v2trap.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/contrib/ipfilter/lib/printhost.c b/contrib/ipfilter/lib/printhost.c index eaf3fda..009a9bb 100644 --- a/contrib/ipfilter/lib/printhost.c +++ b/contrib/ipfilter/lib/printhost.c @@ -23,9 +23,9 @@ printhost(family, addr) if ((family == -1) || !*addr) PRINTF("any"); else { +#ifdef USE_INET6 void *ptr = addr; -#ifdef USE_INET6 PRINTF("%s", inet_ntop(family, ptr, ipbuf, sizeof(ipbuf))); #else ipa.s_addr = *addr; diff --git a/contrib/ipfilter/lib/printhostmask.c b/contrib/ipfilter/lib/printhostmask.c index 10d90b2..b1e41f9 100644 --- a/contrib/ipfilter/lib/printhostmask.c +++ b/contrib/ipfilter/lib/printhostmask.c @@ -25,9 +25,9 @@ printhostmask(family, addr, mask) if ((family == -1) || ((!addr || !*addr) && (!mask || !*mask))) PRINTF("any"); else { +#ifdef USE_INET6 void *ptr = addr; -#ifdef USE_INET6 PRINTF("%s", inet_ntop(family, ptr, ipbuf, sizeof(ipbuf))); #else ipa.s_addr = *addr; diff --git a/contrib/ipfilter/lib/save_v1trap.c b/contrib/ipfilter/lib/save_v1trap.c index b17f62c..78671c7 100644 --- a/contrib/ipfilter/lib/save_v1trap.c +++ b/contrib/ipfilter/lib/save_v1trap.c @@ -178,7 +178,7 @@ snmpv1_parse(char **strings) if (ctx->fd >= 0) { ctx->sin.sin_family = AF_INET; ctx->sin.sin_port = htons(162); - if (connect(ctx->fd, &ctx->sin, + if (connect(ctx->fd, (struct sockaddr *)&ctx->sin, sizeof(ctx->sin)) != 0) { snmpv1_destroy(ctx); return NULL; diff --git a/contrib/ipfilter/lib/save_v2trap.c b/contrib/ipfilter/lib/save_v2trap.c index 24349bb..78e76f6 100644 --- a/contrib/ipfilter/lib/save_v2trap.c +++ b/contrib/ipfilter/lib/save_v2trap.c @@ -181,7 +181,7 @@ snmpv2_parse(char **strings) if (ctx->fd >= 0) { ctx->sin.sin_family = AF_INET; ctx->sin.sin_port = htons(162); - if (connect(ctx->fd, &ctx->sin, + if (connect(ctx->fd, (struct sockaddr *)&ctx->sin, sizeof(ctx->sin)) != 0) { snmpv2_destroy(ctx); return NULL; |
