In set_interfaces() treat a parse error as fatal.

diff --git a/plugins/sudoers/interfaces.c b/plugins/sudoers/interfaces.c
index 583d75ef73f5d9f17d23f220e9a0ee96188c29c7..2a868b59e7fb9095bf3fa94c5e2adc95af2ea6ba 100644 (file)
--- a/plugins/sudoers/interfaces.c
+++ b/plugins/sudoers/interfaces.c
@@ -47,7 +47,8 @@ static struct interface_list interfaces;
 
 /*
  * Parse a space-delimited list of IP address/netmask pairs and
- * store in a list of interface structures.
+ * store in a list of interface structures.  Returns true on
+ * success and false on parse error or memory allocation error.
  */
 bool
 set_interfaces(const char *ai)
@@ -67,28 +68,39 @@ set_interfaces(const char *ai)
 
        /* Parse addr and store in list. */
        if ((ifp = calloc(1, sizeof(*ifp))) == NULL) {
-           sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
-               "unable to allocate memory");
+           sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory"));
            goto done;
        }
        if (strchr(addr, ':')) {
            /* IPv6 */
 #ifdef HAVE_STRUCT_IN6_ADDR
            ifp->family = AF_INET6;
-           if (inet_pton(AF_INET6, addr, &ifp->addr.ip6) != 1 ||
-               inet_pton(AF_INET6, mask, &ifp->netmask.ip6) != 1)
-#endif
-           {
+           if (inet_pton(AF_INET6, addr, &ifp->addr.ip6) != 1) {
+               sudo_warnx(U_("unable to parse IP address \"%s\""), addr);
+               free(ifp);
+               goto done;
+           }
+           if (inet_pton(AF_INET6, mask, &ifp->netmask.ip6) != 1) {
+               sudo_warnx(U_("unable to parse netmask \"%s\""), mask);
                free(ifp);
-               continue;
+               goto done;
            }
+#else
+           free(ifp);
+           continue;
+#endif
        } else {
            /* IPv4 */
            ifp->family = AF_INET;
-           if (inet_pton(AF_INET, addr, &ifp->addr.ip4) != 1 ||
-               inet_pton(AF_INET, mask, &ifp->netmask.ip4) != 1) {
+           if (inet_pton(AF_INET, addr, &ifp->addr.ip4) != 1) {
+               sudo_warnx(U_("unable to parse IP address \"%s\""), addr);
+               free(ifp);
+               goto done;
+           }
+           if (inet_pton(AF_INET, mask, &ifp->netmask.ip4) != 1) {
+               sudo_warnx(U_("unable to parse netmask \"%s\""), mask);
                free(ifp);
-               continue;
+               goto done;
            }
        }
        SLIST_INSERT_HEAD(&interfaces, ifp, entries);