Imported Upstream version 1.8.5

[debian/sudo] / plugins / sudoers / match_addr.c

diff --git a/plugins/sudoers/match_addr.c b/plugins/sudoers/match_addr.c
index 9634eaca828f415954fd210b45d61f5bcc7609ae..23e68677933e29f8421075c67d66ba4a24e50369 100644 (file)
--- a/plugins/sudoers/match_addr.c
+++ b/plugins/sudoers/match_addr.c
@@ -74,7 +74,7 @@ addr_matches_if(char *n)
     for (ifp = interfaces; ifp != NULL; ifp = ifp->next) {
        if (ifp->family != family)
            continue;
-       switch(family) {
+       switch (family) {
            case AF_INET:
                if (ifp->addr.ip4.s_addr == addr.ip4.s_addr ||
                    (ifp->addr.ip4.s_addr & ifp->netmask.ip4.s_addr)
@@ -92,6 +92,7 @@ addr_matches_if(char *n)
                }
                if (j == sizeof(addr.ip6.s6_addr))
                    debug_return_bool(true);
+               break;
 #endif /* HAVE_STRUCT_IN6_ADDR */
        }
     }
@@ -156,10 +157,11 @@ addr_matches_if_netmask(char *n, char *m)
     for (ifp = interfaces; ifp != NULL; ifp = ifp->next) {
        if (ifp->family != family)
            continue;
-       switch(family) {
+       switch (family) {
            case AF_INET:
                if ((ifp->addr.ip4.s_addr & mask.ip4.s_addr) == addr.ip4.s_addr)
                    debug_return_bool(true);
+               break;
 #ifdef HAVE_STRUCT_IN6_ADDR
            case AF_INET6:
                for (j = 0; j < sizeof(addr.ip6.s6_addr); j++) {
@@ -168,6 +170,7 @@ addr_matches_if_netmask(char *n, char *m)
                }
                if (j == sizeof(addr.ip6.s6_addr))
                    debug_return_bool(true);
+               break;
 #endif /* HAVE_STRUCT_IN6_ADDR */
        }
     }