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

added support for net_addr/netmask

Browse Source
This commit is contained in:
Todd C. Miller
1996-06-17 04:02:33 +00:00
parent 0ede02bbe4
commit f66eb18a5d
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
parse.c
View File

@@ -305,15 +305,28 @@ int addr_matches(n)
char *n; char *n;
{ {
int i; int i;
struct in_addr addr; char *m;
struct in_addr addr, mask;
addr.s_addr = inet_addr(n); /* If there's an explicate netmask, use it. */
if ((m = strchr(n, '/'))) {
*m++ = '\0';
mask.s_addr = inet_addr(m);
addr.s_addr = inet_addr(n);
*(m - 1) = '/';
for (i = 0; i < num_interfaces; i++) for (i = 0; i < num_interfaces; i++)
if (interfaces[i].addr.s_addr == addr.s_addr || if ((interfaces[i].addr.s_addr & mask.s_addr) == addr.s_addr)
(interfaces[i].addr.s_addr & interfaces[i].netmask.s_addr) return(TRUE);
== addr.s_addr) } else {
return(TRUE); addr.s_addr = inet_addr(n);
for (i = 0; i < num_interfaces; i++)
if (interfaces[i].addr.s_addr == addr.s_addr ||
(interfaces[i].addr.s_addr & interfaces[i].netmask.s_addr)
== addr.s_addr)
return(TRUE);
}
return(FALSE); return(FALSE);
} }

3
parse.lex
View File

@@ -77,6 +77,7 @@ extern void yyerror __P((char *));
%} %}
OCTET [[:digit:]]{1,3} OCTET [[:digit:]]{1,3}
DOTTEDQUAD {OCTET}(\.{OCTET}){3}
WORD [[:alnum:]_-]+ WORD [[:alnum:]_-]+
%e 4000 %e 4000
@@ -176,7 +177,7 @@ NOPASSWD: {
return(USERGROUP); return(USERGROUP);
} }
{OCTET}(\.{OCTET}){3} { {DOTTEDQUAD}(\/{DOTTEDQUAD})? {
fill(yytext, yyleng); fill(yytext, yyleng);
LEXTRACE("NTWKADDR "); LEXTRACE("NTWKADDR ");
return(NTWKADDR); return(NTWKADDR);