Author: asomers
Date: Thu Aug 15 19:27:36 2019
New Revision: 351101
URL: https://svnweb.freebsd.org/changeset/base/351101

Log:
  ping6: fix uninitialized variable warnings when MK_CASPER=no
  
  Submitted by: Ján Sučan <sucan...@gmail.com>
  MFC after:    2 weeks
  Sponsored by: Google, inc. (Google Summer of Code 2019)
  Differential Revision:        https://reviews.freebsd.org/D21273

Modified:
  head/sbin/ping6/ping6.c

Modified: head/sbin/ping6/ping6.c
==============================================================================
--- head/sbin/ping6/ping6.c     Thu Aug 15 18:59:52 2019        (r351100)
+++ head/sbin/ping6/ping6.c     Thu Aug 15 19:27:36 2019        (r351101)
@@ -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);
 }
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to