aboutsummaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorAlan Somers <asomers@FreeBSD.org>2019-08-15 19:27:36 +0000
committerAlan Somers <asomers@FreeBSD.org>2019-08-15 19:27:36 +0000
commit8a3107c8f329bff0380750da76ddf85f54fa9ecd (patch)
tree66fd6ef1ca2c07407003cd3579bcfe548891634a /sbin
parent017455f13c6eb761ee1285ac0c91ad074e7ccaae (diff)
downloadsrc-8a3107c8f329bff0380750da76ddf85f54fa9ecd.tar.gz
src-8a3107c8f329bff0380750da76ddf85f54fa9ecd.zip
ping6: fix uninitialized variable warnings when MK_CASPER=no
Submitted by: Ján Sučan <sucanjan@gmail.com> MFC after: 2 weeks Sponsored by: Google, inc. (Google Summer of Code 2019) Differential Revision: https://reviews.freebsd.org/D21273
Notes
Notes: svn path=/head/; revision=351101
Diffstat (limited to 'sbin')
-rw-r--r--sbin/ping6/ping6.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index 917503ccf219..6c70a0f33a4d 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -961,6 +961,7 @@ main(int argc, char *argv[])
}
/* From now on we will use only reverse DNS lookups. */
+#ifdef WITH_CASPER
if (capdns != NULL) {
const char *types[1];
@@ -968,7 +969,7 @@ main(int argc, char *argv[])
if (cap_dns_type_limit(capdns, types, nitems(types)) < 0)
err(1, "unable to limit access to system.dns service");
}
-
+#endif
if (!(options & F_SRCADDR)) {
/*
* get the source address. XXX since we revoked the root
@@ -2780,9 +2781,10 @@ static cap_channel_t *
capdns_setup(void)
{
cap_channel_t *capcas, *capdnsloc;
+#ifdef WITH_CASPER
const char *types[2];
int families[1];
-
+#endif
capcas = cap_init();
if (capcas == NULL)
err(1, "unable to create casper process");
@@ -2791,6 +2793,7 @@ capdns_setup(void)
cap_close(capcas);
if (capdnsloc == NULL)
err(1, "unable to open system.dns service");
+#ifdef WITH_CASPER
types[0] = "NAME2ADDR";
types[1] = "ADDR2NAME";
if (cap_dns_type_limit(capdnsloc, types, nitems(types)) < 0)
@@ -2798,6 +2801,6 @@ capdns_setup(void)
families[0] = AF_INET6;
if (cap_dns_family_limit(capdnsloc, families, nitems(families)) < 0)
err(1, "unable to limit access to system.dns service");
-
+#endif
return (capdnsloc);
}