--- embedaddon/sudo/plugins/sudoers/interfaces.c 2012/05/29 12:26:49 1.1.1.2 +++ embedaddon/sudo/plugins/sudoers/interfaces.c 2014/06/15 16:12:54 1.1.1.4 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Todd C. Miller + * Copyright (c) 2010-2013 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -18,7 +18,6 @@ #include #include -#include #include #ifdef STDC_HEADERS # include @@ -52,6 +51,8 @@ # define INADDR_NONE ((unsigned int)-1) #endif +static struct interface_list interfaces; + /* * Parse a space-delimited list of IP address/netmask pairs and * store in a list of interface structures. @@ -86,19 +87,22 @@ set_interfaces(const char *ai) } else { /* IPv4 */ ifp->family = AF_INET; - ifp->addr.ip4.s_addr = inet_addr(addr); - ifp->netmask.ip4.s_addr = inet_addr(mask); - if (ifp->addr.ip4.s_addr == INADDR_NONE || - ifp->netmask.ip4.s_addr == INADDR_NONE) { + if (inet_pton(AF_INET, addr, &ifp->addr.ip4) != 1 || + inet_pton(AF_INET, mask, &ifp->netmask.ip4) != 1) { efree(ifp); continue; } } - ifp->next = interfaces; - interfaces = ifp; + SLIST_INSERT_HEAD(&interfaces, ifp, entries); } efree(addrinfo); debug_return; +} + +struct interface_list * +get_interfaces(void) +{ + return &interfaces; } void