From: Todd C. Miller <Todd.Miller@sudo.ws>
Date: Thu, 20 Sep 2018 20:56:25 +0000 (-0600)
Subject: When expanding an alias in print_member_json_int() avoid printing
X-Git-Tag: SUDO_1_8_26^2~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8aad36508271c751d1f34c8b595d13879f513856;p=sudo

When expanding an alias in print_member_json_int() avoid printing
an extra comma at the end of the entry.  Bug #853.
---

diff --git a/plugins/sudoers/cvtsudoers_json.c b/plugins/sudoers/cvtsudoers_json.c
index 9490579fc..901f2b104 100644
--- a/plugins/sudoers/cvtsudoers_json.c
+++ b/plugins/sudoers/cvtsudoers_json.c
@@ -500,10 +500,11 @@ print_member_json_int(FILE *fp, struct sudoers_parse_tree *parse_tree,
     } else {
 	print_pair_json(fp, "{ ", typestr, &value, " }", indent);
     }
-    if (!last_one)
-	putc(',', fp);
-    if (need_newline)
+    if (need_newline) {
+	if (!last_one)
+	    putc(',', fp);
 	putc('\n', fp);
+    }
 
     debug_return;
 }