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

Set errno to ELOOP in alias_find() if there is a cycle.

Browse Source 
Set errno to ENOENT in alias_find() and alias_remove() if the
entry could not be found.
This commit is contained in:
Todd C. Miller
2011-05-25 12:54:15 -04:00
parent 682333ae2d
commit 2b98492871
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
plugins/sudoers/alias.c
View File

@@ -44,6 +44,7 @@
#include "parse.h" #include "parse.h"
#include "redblack.h" #include "redblack.h"
#include <gram.h> #include <gram.h>
#include <errno.h>
/* /*
* Globals * Globals
@@ -85,15 +86,19 @@ alias_find(char *name, int type)
key.name = name; key.name = name;
key.type = type; key.type = type;
if ((node = rbfind(aliases, &key)) != NULL) { if ((node = rbfind(aliases, &key)) != NULL) {
/* /*
* Compare the global sequence number with the one stored * Compare the global sequence number with the one stored
* in the alias. If they match then we've seen this alias * in the alias. If they match then we've seen this alias
* before and found a loop. * before and found a loop.
*/ */
a = node->data; a = node->data;
if (a->seqno == alias_seqno) if (a->seqno == alias_seqno) {
return NULL; errno = ELOOP;
a->seqno = alias_seqno; return NULL;
}
a->seqno = alias_seqno;
} else {
errno = ENOENT;
} }
return a; return a;
} }
@@ -175,8 +180,10 @@ alias_remove(char *name, int type)
key.name = name; key.name = name;
key.type = type; key.type = type;
if ((node = rbfind(aliases, &key)) == NULL) if ((node = rbfind(aliases, &key)) == NULL) {
errno = ENOENT;
return NULL; return NULL;
}
return rbdelete(aliases, node); return rbdelete(aliases, node);
} }