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

Replace sequence number-based cycle detection in visudo with a

Browse Source 
"used" flag in struct alias.  The caller is required to call
alias_put() when it is done with the alias.  Inspired by a patch
from Daniel Kopecek.
This commit is contained in:
Todd C. Miller
2013-05-22 11:32:08 -04:00
parent 8a57f129ac
commit ab61c02546
8 changed files with 104 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/sudoers/parse.c
View File

@@ -754,7 +754,7 @@ _print_member(struct lbuf *lbuf, char *name, int type, int negated,
}
break;
case ALIAS:
if ((a = alias_find(name, alias_type)) != NULL) {
if ((a = alias_get(name, alias_type)) != NULL) {
tq_foreach_fwd(&a->members, m) {
if (m != tq_first(&a->members))
lbuf_append(lbuf, "%s", separator);
@@ -762,6 +762,7 @@ _print_member(struct lbuf *lbuf, char *name, int type, int negated,
negated ? !m->negated : m->negated, separator,
alias_type);
}
alias_put(a);
break;
}
/* FALLTHROUGH */
@@ -775,7 +776,6 @@ _print_member(struct lbuf *lbuf, char *name, int type, int negated,
static void
print_member(struct lbuf *lbuf, struct member *m, int alias_type)
{
alias_seqno++;
_print_member(lbuf, m->name, m->type, m->negated, ", ", alias_type);
}
@@ -783,6 +783,5 @@ static void
print_member2(struct lbuf *lbuf, struct member *m, const char *separator,
int alias_type)
{
alias_seqno++;
_print_member(lbuf, m->name, m->type, m->negated, separator, alias_type);
}