In sudoers_format_userspecs make the separator optional and silence

a printf format warning.

diff --git a/plugins/sudoers/fmtsudoers.c b/plugins/sudoers/fmtsudoers.c
index 3116996b95816b41026576444e47d9c17d48af6a..4ab7fb0b4c6638bdf13ae0bc7bd5ac7f50052cc0 100644 (file)
--- a/plugins/sudoers/fmtsudoers.c
+++ b/plugins/sudoers/fmtsudoers.c
@@ -291,14 +291,14 @@ sudoers_format_userspec(struct sudo_lbuf *lbuf, struct userspec *us,
  */
 bool
 sudoers_format_userspecs(struct sudo_lbuf *lbuf, struct userspec_list *usl,
-    const char *sep, bool expand_aliases, bool flush)
+    const char *separator, bool expand_aliases, bool flush)
 {
     struct userspec *us;
     debug_decl(sudoers_format_userspecs, SUDOERS_DEBUG_UTIL)
 
     TAILQ_FOREACH(us, usl, entries) {
-       if (us != TAILQ_FIRST(usl))
-           sudo_lbuf_append(lbuf, sep);
+       if (separator != NULL && us != TAILQ_FIRST(usl))
+           sudo_lbuf_append(lbuf, "%s", separator);
        if (!sudoers_format_userspec(lbuf, us, expand_aliases))
            break;
        sudo_lbuf_print(lbuf);

diff --git a/plugins/sudoers/parse.h b/plugins/sudoers/parse.h
index 31dfc7fac900f6e64ac3c7d435af0f045637707d..dd5ac9ef1cffedacf61bba1d973ee88866c3bd57 100644 (file)
--- a/plugins/sudoers/parse.h
+++ b/plugins/sudoers/parse.h
@@ -323,6 +323,6 @@ bool sudoers_format_default_line(struct sudo_lbuf *lbuf, struct defaults *d, str
 bool sudoers_format_member(struct sudo_lbuf *lbuf, struct member *m, const char *separator, int alias_type);
 bool sudoers_format_privilege(struct sudo_lbuf *lbuf, struct privilege *priv, bool expand_aliases);
 bool sudoers_format_userspec(struct sudo_lbuf *lbuf, struct userspec *us, bool expand_aliases);
-bool sudoers_format_userspecs(struct sudo_lbuf *lbuf, struct userspec_list *usl, const char *sep, bool expand_aliases, bool flush);
+bool sudoers_format_userspecs(struct sudo_lbuf *lbuf, struct userspec_list *usl, const char *separator, bool expand_aliases, bool flush);
 
 #endif /* SUDOERS_PARSE_H */