postfix-3.11-20251125

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 437e2877003f834840b019b983a1c3d4c1443f98..1e543007e5f29013945761f5761410929a3beb29 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -30082,3 +30082,8 @@ Apologies for any names omitted.
        Added basic tests to verify the output formats for original
        and JSON output. Files: postmulti/postmulti.c,
        postmulti/fake_strcmp.c, postmulti/Makefile.in.
+
+20251125
+
+       Cleanup: too many braces in postmulti JSON output.  Files:
+       postmulti/Makefile.in, postmulti/postmulti.c.

diff --git a/postfix/html/postmulti.1.html b/postfix/html/postmulti.1.html
index 47eec47cbfe564b046e7c82893c16b3ce38c852f..6467cbb3eb8c4b9bfb7cdfcfc35ccc028a4ecfbc 100644 (file)
--- a/postfix/html/postmulti.1.html
+++ b/postfix/html/postmulti.1.html
@@ -99,6 +99,8 @@ POSTMULTI(1)                                                      POSTMULTI(1)
 <b>List mode</b>
        <b>-j</b>     Produce JSON output. See JSON OBJECT FORMAT below.
 
+              This feature is available in Postfix version 3.11 and later.
+
        <b>-l</b>     List Postfix instances with their instance name, instance  group
               name, enable/disable status and configuration directory.
 

diff --git a/postfix/man/man1/postmulti.1 b/postfix/man/man1/postmulti.1
index 45273c80414f35a559227c6f5106ce46e97a38b7..af552dde668603914ee5f7efb34948035696b8a5 100644 (file)
--- a/postfix/man/man1/postmulti.1
+++ b/postfix/man/man1/postmulti.1
@@ -121,6 +121,8 @@ This option cannot be used with \fB\-p\fR.
 .fi
 .IP \fB\-j\fR
 Produce JSON output. See JSON OBJECT FORMAT below.
+
+This feature is available in Postfix version 3.11 and later.
 .IP \fB\-l\fR
 List Postfix instances with their instance name, instance
 group name, enable/disable status and configuration directory.

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 260b40159007b902e7d93578df4155f7704c82bb..7116469dd0ad3df699d6bea7f87190a15dd19ad3 100644 (file)
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE      "20251124"
+#define MAIL_RELEASE_DATE      "20251125"
 #define MAIL_VERSION_NUMBER    "3.11"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/postmulti/Makefile.in b/postfix/src/postmulti/Makefile.in
index bb84a46d7ec99cee2b04ac07176a9ae3c578898a..e9309b9844f40b2080441356d6df3f8c98559219 100644 (file)
--- a/postfix/src/postmulti/Makefile.in
+++ b/postfix/src/postmulti/Makefile.in
@@ -58,7 +58,7 @@ json_single_test: $(PROG) fake_strcmp.so
        echo daemon_directory = ../../libexec >> main.cf
        echo meta_directory = . >> main.cf
        echo shlib_directory = ../../lib >> main.cf
-       echo "{{\"name\": \"-\"},{\"group\": \"-\"},{\"enabled\": \"y\"},{\"config_directory\": \".\"}}" >> json_single_test.tmp
+       echo "{\"name\": \"-\",\"group\": \"-\",\"enabled\": \"y\",\"config_directory\": \".\"}" >> json_single_test.tmp
        $(SHLIB_ENV) ${VALGRIND} LD_PRELOAD=./fake_strcmp.so MAIL_CONFIG=. \
            ./$(PROG) -lj | diff json_single_test.tmp -
        rm -f main.cf json_single_test.tmp

diff --git a/postfix/src/postmulti/postmulti.c b/postfix/src/postmulti/postmulti.c
index dddde25718025d4945704a85042d450e1f73874b..5bd0b27a743e3cb751a5b681b26b53780dfad50f 100644 (file)
--- a/postfix/src/postmulti/postmulti.c
+++ b/postfix/src/postmulti/postmulti.c
@@ -107,6 +107,8 @@
 /* .fi
 /* .IP \fB-j\fR
 /*     Produce JSON output. See JSON OBJECT FORMAT below.
+/*
+/*     This feature is available in Postfix version 3.11 and later.
 /* .IP \fB-l\fR
 /*     List Postfix instances with their instance name, instance
 /*     group name, enable/disable status and configuration directory.
@@ -1602,16 +1604,16 @@ static void list_instances(int iter_flags, INST_SELECTION *selection)
                               ip->enabled ? "y" : "n",
                               ip->config_dir);
            } else {
-               vstream_printf("{{\"name\": \"%s\"},",
+               vstream_printf("{\"name\": \"%s\",",
                               quote_for_json(json_buf,
                                            ip->name ? ip->name : "-", -1));
-               vstream_printf("{\"group\": \"%s\"},",
+               vstream_printf("\"group\": \"%s\",",
                               quote_for_json(json_buf,
                                           ip->gname ? ip->gname : "-", 1));
-               vstream_printf("{\"enabled\": \"%s\"},",
+               vstream_printf("\"enabled\": \"%s\",",
                               quote_for_json(json_buf,
                                              ip->enabled ? "y" : "n", 1));
-               vstream_printf("{\"config_directory\": \"%s\"}}\n",
+               vstream_printf("\"config_directory\": \"%s\"}\n",
                               quote_for_json(json_buf,
                                              ip->config_dir, -1));
            }