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

Merge pull request #279 from AtariDreams/bison

Browse Source 
Regenerate toke.c using updated flex
This commit is contained in:
Todd C. Miller
2023-07-01 10:23:40 -06:00
committed by GitHub
parent 5fbf431c42 6ea68d208e
commit 2a4939a1c5
2 changed files with 583 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

885
plugins/sudoers/toke.c
View File

File diff suppressed because it is too large Load Diff

35
plugins/sudoers/toke.l
View File

@@ -411,7 +411,7 @@ DEFVAR [a-z_]+
<INITIAL>^[[:blank:]]*Defaults([:@>\!][[:blank:]]*\!*\"?({ID}|{WORD}))? { <INITIAL>^[[:blank:]]*Defaults([:@>\!][[:blank:]]*\!*\"?({ID}|{WORD}))? {
char deftype; char deftype;
int n; size_t n;
if (continued) { if (continued) {
sudoers_errstr = N_("invalid line continuation"); sudoers_errstr = N_("invalid line continuation");
@@ -451,7 +451,7 @@ DEFVAR [a-z_]+
} }
<INITIAL>^[[:blank:]]*(Host|Cmnd|Cmd|User|Runas)_Alias { <INITIAL>^[[:blank:]]*(Host|Cmnd|Cmd|User|Runas)_Alias {
int n; size_t n;
if (continued) { if (continued) {
sudoers_errstr = N_("invalid line continuation"); sudoers_errstr = N_("invalid line continuation");
@@ -942,12 +942,12 @@ pl_compare(const void *v1, const void *v2)
* Returns the number of files or -1 on error. * Returns the number of files or -1 on error.
* If zero files are found, NULL is stored in pathsp. * If zero files are found, NULL is stored in pathsp.
*/ */
static int static size_t
read_dir_files(const char *dirpath, struct path_list ***pathsp, int verbose) read_dir_files(const char *dirpath, struct path_list ***pathsp, int verbose)
{ {
DIR *dir; DIR *dir;
int i, count = 0; size_t i, count = 0;
int max_paths = 32; size_t max_paths = 32;
struct dirent *dent; struct dirent *dent;
struct path_list **paths = NULL; struct path_list **paths = NULL;
const size_t dirlen = strlen(dirpath); const size_t dirlen = strlen(dirpath);
@@ -1026,7 +1026,7 @@ read_dir_files(const char *dirpath, struct path_list ***pathsp, int verbose)
} }
done: done:
*pathsp = paths; *pathsp = paths;
debug_return_int(count); debug_return_size_t(count);
oom: oom:
sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory")); sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory"));
bad: bad:
@@ -1038,18 +1038,18 @@ bad:
free(paths[i]); free(paths[i]);
} }
free(paths); free(paths);
debug_return_int(-1); debug_return_size_t(-1);
} }
/* /*
* Push a list of all files in dirpath onto stack. * Push a list of all files in dirpath onto stack.
* Returns the number of files or -1 on error. * Returns the number of files or -1 on error.
*/ */
static int static size_t
switch_dir(struct include_stack *stack, char *dirpath, int verbose) switch_dir(struct include_stack *stack, char *dirpath, int verbose)
{ {
struct path_list **paths = NULL; struct path_list **paths = NULL;
int count, i; size_t count, i;
debug_decl(switch_dir, SUDOERS_DEBUG_PARSER); debug_decl(switch_dir, SUDOERS_DEBUG_PARSER);
count = read_dir_files(dirpath, &paths, verbose); count = read_dir_files(dirpath, &paths, verbose);
@@ -1064,7 +1064,7 @@ switch_dir(struct include_stack *stack, char *dirpath, int verbose)
free(paths); free(paths);
} }
debug_return_int(count); debug_return_size_t(count);
} }
#define MAX_SUDOERS_DEPTH 128 #define MAX_SUDOERS_DEPTH 128
@@ -1162,7 +1162,7 @@ expand_include(const char *src)
const char *cp, *ep; const char *cp, *ep;
char *dst0, *dst; char *dst0, *dst;
size_t dst_size, src_len; size_t dst_size, src_len;
unsigned int nhost = 0; size_t nhost = 0;
debug_decl(expand_include, SUDOERS_DEBUG_PARSER); debug_decl(expand_include, SUDOERS_DEBUG_PARSER);
/* Strip double quotes if present. */ /* Strip double quotes if present. */
@@ -1306,7 +1306,8 @@ push_include_int(const char *opath, bool isdir, int verbose)
if (isdir) { if (isdir) {
struct stat sb; struct stat sb;
char dname[PATH_MAX]; char dname[PATH_MAX];
int count, fd, status; int fd, status;
size_t count;
fd = sudo_open_conf_path(path, dname, sizeof(dname), NULL); fd = sudo_open_conf_path(path, dname, sizeof(dname), NULL);
status = sudo_secure_fd(fd, S_IFDIR, sudoers_file_uid(), status = sudo_secure_fd(fd, S_IFDIR, sudoers_file_uid(),
@@ -1342,10 +1343,16 @@ push_include_int(const char *opath, bool isdir, int verbose)
debug_return_bool(true); debug_return_bool(true);
} }
count = switch_dir(&istack[idepth], dname, verbose); count = switch_dir(&istack[idepth], dname, verbose);
if (count <= 0) { if (count == 0) {
/* switch_dir() called sudoerserror() for us */ /* switch_dir() called sudoerserror() for us */
sudo_rcstr_delref(path); sudo_rcstr_delref(path);
debug_return_bool(count ? false : true); debug_return_bool(true);
}
if (count == (size_t)-1) {
/* switch_dir() called sudoerserror() for us */
sudo_rcstr_delref(path);
debug_return_bool(false);
} }
/* Parse the first dir entry we can open, leave the rest for later. */ /* Parse the first dir entry we can open, leave the rest for later. */