D21322.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D21322.diff
View Options

	Index: head/sbin/ping/ping.c
	===================================================================
	--- head/sbin/ping/ping.c
	+++ head/sbin/ping/ping.c
	@@ -610,6 +610,7 @@
	}

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

	@@ -617,7 +618,7 @@
	if (cap_dns_type_limit(capdns, types, 1) < 0)
	err(1, "unable to limit access to system.dns service");
	}
	-
	+#endif
	if (connect(ssend, (struct sockaddr *)&whereto, sizeof(whereto)) != 0)
	err(1, "connect");

	@@ -1709,9 +1710,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");
	@@ -1720,6 +1722,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, 2) < 0)
	@@ -1727,7 +1730,7 @@
	families[0] = AF_INET;
	if (cap_dns_family_limit(capdnsloc, families, 1) < 0)
	err(1, "unable to limit access to system.dns service");
	-
	+#endif
	return (capdnsloc);
	}