Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 14 Oct 2020 00:01:17 +0000 (UTC)
From:      Adrian Chadd <adrian@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r366690 - head/usr.sbin/traceroute6
Message-ID:  <202010140001.09E01HuA061286@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adrian
Date: Wed Oct 14 00:01:17 2020
New Revision: 366690
URL: https://svnweb.freebsd.org/changeset/base/366690

Log:
  [traceroute6] Don't do the casper bits when we're not doing casper
  
  This with the previous patch I committed makes traceroute6/traceroute
  compile fine when libcasper isn't enabled.
  
  This complains strongly with unused variables and such when compiled
  with gcc-6 on mips32.
  
  Tested:
  
  * compiled/run on mips32 hardware (AR9344)
  
  Reviewed by:	emaste
  Differential Revision: https://reviews.freebsd.org/D26773

Modified:
  head/usr.sbin/traceroute6/traceroute6.c

Modified: head/usr.sbin/traceroute6/traceroute6.c
==============================================================================
--- head/usr.sbin/traceroute6/traceroute6.c	Tue Oct 13 23:29:06 2020	(r366689)
+++ head/usr.sbin/traceroute6/traceroute6.c	Wed Oct 14 00:01:17 2020	(r366690)
@@ -1527,8 +1527,9 @@ get_uphdr(struct ip6_hdr *ip6, u_char *lim)
 }
 
 void
-capdns_open()
+capdns_open(void)
 {
+#ifdef	WITH_CASPER
 	const char *types[] = { "NAME", "ADDR" };
 	int families[1];
 	cap_channel_t *casper;
@@ -1545,6 +1546,7 @@ capdns_open()
 	if (cap_dns_family_limit(capdns, families, nitems(families)) < 0)
 		errx(1, "unable to limit access to system.dns service");
 	cap_close(casper);
+#endif	/* WITH_CASPER */
 }
 
 void



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010140001.09E01HuA061286>