fix compilation on Solaris

diff --git a/plugins/sudoers/cvtsudoers_ldif.c b/plugins/sudoers/cvtsudoers_ldif.c
index 70488a79722fdb12a4218db1abe99aac1798bf04..3209a03e7e2ac2308b3e0825951e693ec5438f52 100644 (file)
--- a/plugins/sudoers/cvtsudoers_ldif.c
+++ b/plugins/sudoers/cvtsudoers_ldif.c
@@ -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) {

diff --git a/plugins/sudoers/fmtsudoers.c b/plugins/sudoers/fmtsudoers.c
index 4ab7fb0b4c6638bdf13ae0bc7bd5ac7f50052cc0..8d86b3140325ecc598f1e00b0bcff8203137fdc9 100644 (file)
--- a/plugins/sudoers/fmtsudoers.c
+++ b/plugins/sudoers/fmtsudoers.c
@@ -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)
 

diff --git a/plugins/sudoers/gram.c b/plugins/sudoers/gram.c
index 02f95300ff1fe3329571f2b0eeffd0460c88f52b..2a7ddf2346b9f1daf7f00e04f34781a5f40eac40 100644 (file)
--- a/plugins/sudoers/gram.c
+++ b/plugins/sudoers/gram.c
@@ -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) {

diff --git a/plugins/sudoers/gram.y b/plugins/sudoers/gram.y
index cc54e101364fb5ed94b459d4359a420efdb3627f..1f36c50571f0b6a7b9d5aa25d5a341e7ffceb3a3 100644 (file)
--- a/plugins/sudoers/gram.y
+++ b/plugins/sudoers/gram.y
@@ -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) {

diff --git a/plugins/sudoers/parse.h b/plugins/sudoers/parse.h
index dd5ac9ef1cffedacf61bba1d973ee88866c3bd57..85c9e750bc0886d74b96b0760c743fdc1741c569 100644 (file)
--- a/plugins/sudoers/parse.h
+++ b/plugins/sudoers/parse.h
@@ -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;
 };