fix compilation on Solaris
This commit is contained in:
@@ -847,7 +847,7 @@ role_to_sudoers(struct sudo_role *role, bool store_options,
|
||||
|
||||
/* Add source role as a comment. */
|
||||
if (role->cn != NULL) {
|
||||
struct comment *comment = NULL;
|
||||
struct sudoers_comment *comment = NULL;
|
||||
if (reuse_userspec) {
|
||||
/* Try to re-use comment too. */
|
||||
STAILQ_FOREACH(comment, &us->comments, entries) {
|
||||
|
@@ -256,7 +256,7 @@ sudoers_format_userspec(struct sudo_lbuf *lbuf, struct userspec *us,
|
||||
bool expand_aliases)
|
||||
{
|
||||
struct privilege *priv;
|
||||
struct comment *comment;
|
||||
struct sudoers_comment *comment;
|
||||
struct member *m;
|
||||
debug_decl(sudoers_format_userspec, SUDOERS_DEBUG_UTIL)
|
||||
|
||||
|
@@ -930,7 +930,7 @@ void
|
||||
free_userspec(struct userspec *us)
|
||||
{
|
||||
struct privilege *priv;
|
||||
struct comment *comment;
|
||||
struct sudoers_comment *comment;
|
||||
|
||||
free_members(&us->users);
|
||||
while ((priv = TAILQ_FIRST(&us->privileges)) != NULL) {
|
||||
|
@@ -1158,7 +1158,7 @@ void
|
||||
free_userspec(struct userspec *us)
|
||||
{
|
||||
struct privilege *priv;
|
||||
struct comment *comment;
|
||||
struct sudoers_comment *comment;
|
||||
|
||||
free_members(&us->users);
|
||||
while ((priv = TAILQ_FIRST(&us->privileges)) != NULL) {
|
||||
|
@@ -150,7 +150,7 @@ TAILQ_HEAD(userspec_list, userspec);
|
||||
TAILQ_HEAD(member_list, member);
|
||||
TAILQ_HEAD(privilege_list, privilege);
|
||||
TAILQ_HEAD(cmndspec_list, cmndspec);
|
||||
STAILQ_HEAD(comment_list, comment);
|
||||
STAILQ_HEAD(comment_list, sudoers_comment);
|
||||
|
||||
/*
|
||||
* Structure describing a user specification and list thereof.
|
||||
@@ -211,8 +211,8 @@ struct runascontainer {
|
||||
struct member *runasgroups;
|
||||
};
|
||||
|
||||
struct comment {
|
||||
STAILQ_ENTRY(comment) entries;
|
||||
struct sudoers_comment {
|
||||
STAILQ_ENTRY(sudoers_comment) entries;
|
||||
char *str;
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user