Make -n work with macros too

Have `exim -n -bP macro FOO` just print the value of the macro `FOO`,
without the `name=` prefix.

This is the same handling as used for option values.

If the invoker asks for multiple macros in one invocation, with `-n`,
then that's their problem.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 5b8ada93ae1f20ad2d557747551c73f2f5663b3e..b0fbf917816a828cdd13287d85748fb1b2fd3d02 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -85,6 +85,8 @@ JH/19 Reject MAIL FROM commands with SMTPUTF8 when the facility was not advertis
       Previously thery were accepted, resulting in issues when attempting to
       forward messages to a non-supporting MTA.
 
       Previously thery were accepted, resulting in issues when attempting to
       forward messages to a non-supporting MTA.
 

+PP/02 Let -n work with printing macros too, not just options.
+

 
 Exim version 4.91
 -----------------
 
 Exim version 4.91
 -----------------

diff --git a/src/src/readconf.c b/src/src/readconf.c
index fbf6d6b493f17ed7a0f31c1aae4a46e53f444477..bf024efc9ed0488b7fcc1465373e6af8e38669d0 100644 (file)
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -2880,6 +2880,8 @@ else if (Ustrcmp(type, "macro") == 0)
       {
       if (names_only)
         printf("%s\n", CS m->name);
       {
       if (names_only)
         printf("%s\n", CS m->name);

+      else if (no_labels)
+        printf("%s\n", CS m->replacement);

       else
         printf("%s=%s\n", CS m->name, CS m->replacement);
       if (name)
       else
         printf("%s=%s\n", CS m->name, CS m->replacement);
       if (name)