isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing break between AF_INET and AF_INET6 in addr_matches_if_netmask()

Browse Source
This commit is contained in:
Todd C. Miller
2012-05-14 14:47:48 -04:00
parent d841ae9cd0
commit 0d5a941319
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/sudoers/match_addr.c
View File

@@ -74,7 +74,7 @@ addr_matches_if(char *n)
for (ifp = interfaces; ifp != NULL; ifp = ifp->next) { for (ifp = interfaces; ifp != NULL; ifp = ifp->next) {
if (ifp->family != family) if (ifp->family != family)
continue; continue;
switch(family) { switch (family) {
case AF_INET: case AF_INET:
if (ifp->addr.ip4.s_addr == addr.ip4.s_addr || if (ifp->addr.ip4.s_addr == addr.ip4.s_addr ||
(ifp->addr.ip4.s_addr & ifp->netmask.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)) if (j == sizeof(addr.ip6.s6_addr))
debug_return_bool(true); debug_return_bool(true);
break;
#endif /* HAVE_STRUCT_IN6_ADDR */ #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) { for (ifp = interfaces; ifp != NULL; ifp = ifp->next) {
if (ifp->family != family) if (ifp->family != family)
continue; continue;
switch(family) { switch (family) {
case AF_INET: case AF_INET:
if ((ifp->addr.ip4.s_addr & mask.ip4.s_addr) == addr.ip4.s_addr) if ((ifp->addr.ip4.s_addr & mask.ip4.s_addr) == addr.ip4.s_addr)
debug_return_bool(true); debug_return_bool(true);
break;
#ifdef HAVE_STRUCT_IN6_ADDR #ifdef HAVE_STRUCT_IN6_ADDR
case AF_INET6: case AF_INET6:
for (j = 0; j < sizeof(addr.ip6.s6_addr); j++) { 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)) if (j == sizeof(addr.ip6.s6_addr))
debug_return_bool(true); debug_return_bool(true);
break;
#endif /* HAVE_STRUCT_IN6_ADDR */ #endif /* HAVE_STRUCT_IN6_ADDR */
} }
} }