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

Store column number for aliases, defaults and userspecs too.

Browse Source 
This is used to provided the column number along with the line
number in error messages.  For aliases we store the column of the
alias name, not the value since that is what visudo generally needs.
This commit is contained in:
Todd C. Miller
2020-11-02 05:39:06 -07:00
parent 982012dbb1
commit 6286ce1d16
16 changed files with 602 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/sudoers/parse.h
View File

@@ -176,7 +176,8 @@ struct userspec {
struct member_list users; /* list of users */
struct privilege_list privileges; /* list of privileges */
struct comment_list comments; /* optional comments */
int lineno; /* line number in sudoers */
int line; /* line number in sudoers */
int column; /* column number in sudoers */
char *file; /* name of sudoers file */
};
@@ -252,7 +253,8 @@ struct alias {
char *name; /* alias name */
unsigned short type; /* {USER,HOST,RUNAS,CMND}ALIAS */
short used; /* "used" flag for cycle detection */
int lineno; /* line number of alias entry */
int line; /* line number of alias entry */
int column; /* column number of alias entry */
char *file; /* file the alias entry was in */
struct member_list members; /* list of alias members */
};
@@ -269,7 +271,8 @@ struct defaults {
short type; /* DEFAULTS{,_USER,_RUNAS,_HOST} */
char op; /* true, false, '+', '-' */
char error; /* parse error flag */
int lineno; /* line number of Defaults entry */
int line; /* line number of Defaults entry */
int column; /* column number of Defaults entry */
};
/*
@@ -295,7 +298,7 @@ struct cmnd_info {
struct rbtree *alloc_aliases(void);
void free_aliases(struct rbtree *aliases);
bool no_aliases(struct sudoers_parse_tree *parse_tree);
const char *alias_add(struct sudoers_parse_tree *parse_tree, char *name, int type, char *file, int lineno, struct member *members);
const char *alias_add(struct sudoers_parse_tree *parse_tree, char *name, int type, char *file, int line, int column, struct member *members);
const char *alias_type_to_string(int alias_type);
struct alias *alias_get(struct sudoers_parse_tree *parse_tree, const char *name, int type);
struct alias *alias_remove(struct sudoers_parse_tree *parse_tree, char *name, int type);