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

fix compilation on Solaris

Browse Source
This commit is contained in:
Todd C. Miller
2018-03-10 20:16:20 -07:00
parent 1cb5ab8b9c
commit 910f288948
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/sudoers/cvtsudoers_ldif.c
View File

@@ -847,7 +847,7 @@ role_to_sudoers(struct sudo_role *role, bool store_options,
/* Add source role as a comment. */ /* Add source role as a comment. */
if (role->cn != NULL) { if (role->cn != NULL) {
struct comment *comment = NULL; struct sudoers_comment *comment = NULL;
if (reuse_userspec) { if (reuse_userspec) {
/* Try to re-use comment too. */ /* Try to re-use comment too. */
STAILQ_FOREACH(comment, &us->comments, entries) { STAILQ_FOREACH(comment, &us->comments, entries) {

2
plugins/sudoers/fmtsudoers.c
View File

@@ -256,7 +256,7 @@ sudoers_format_userspec(struct sudo_lbuf *lbuf, struct userspec *us,
bool expand_aliases) bool expand_aliases)
{ {
struct privilege *priv; struct privilege *priv;
struct comment *comment; struct sudoers_comment *comment;
struct member *m; struct member *m;
debug_decl(sudoers_format_userspec, SUDOERS_DEBUG_UTIL) debug_decl(sudoers_format_userspec, SUDOERS_DEBUG_UTIL)

2
plugins/sudoers/gram.c
View File

@@ -930,7 +930,7 @@ void
free_userspec(struct userspec *us) free_userspec(struct userspec *us)
{ {
struct privilege *priv; struct privilege *priv;
struct comment *comment; struct sudoers_comment *comment;
free_members(&us->users); free_members(&us->users);
while ((priv = TAILQ_FIRST(&us->privileges)) != NULL) { while ((priv = TAILQ_FIRST(&us->privileges)) != NULL) {

2
plugins/sudoers/gram.y
View File

@@ -1158,7 +1158,7 @@ void
free_userspec(struct userspec *us) free_userspec(struct userspec *us)
{ {
struct privilege *priv; struct privilege *priv;
struct comment *comment; struct sudoers_comment *comment;
free_members(&us->users); free_members(&us->users);
while ((priv = TAILQ_FIRST(&us->privileges)) != NULL) { while ((priv = TAILQ_FIRST(&us->privileges)) != NULL) {

6
plugins/sudoers/parse.h
View File

@@ -150,7 +150,7 @@ TAILQ_HEAD(userspec_list, userspec);
TAILQ_HEAD(member_list, member); TAILQ_HEAD(member_list, member);
TAILQ_HEAD(privilege_list, privilege); TAILQ_HEAD(privilege_list, privilege);
TAILQ_HEAD(cmndspec_list, cmndspec); TAILQ_HEAD(cmndspec_list, cmndspec);
STAILQ_HEAD(comment_list, comment); STAILQ_HEAD(comment_list, sudoers_comment);
/* /*
* Structure describing a user specification and list thereof. * Structure describing a user specification and list thereof.
@@ -211,8 +211,8 @@ struct runascontainer {
struct member *runasgroups; struct member *runasgroups;
}; };
struct comment { struct sudoers_comment {
STAILQ_ENTRY(comment) entries; STAILQ_ENTRY(sudoers_comment) entries;
char *str; char *str;
}; };