D21273.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D21273.diff
View Options

	Index: head/sbin/ping6/ping6.c
	===================================================================
	--- head/sbin/ping6/ping6.c
	+++ head/sbin/ping6/ping6.c
	@@ -961,6 +961,7 @@
	}

	/* From now on we will use only reverse DNS lookups. */
	+#ifdef WITH_CASPER
	if (capdns != NULL) {
	const char *types[1];

	@@ -968,7 +969,7 @@
	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 @@
	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 @@
	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 @@
	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);
	}