Fix -bi. Bug 2590

    Actual fix from pierre.labastie@neuf.fr ; additional coding and testcase bu jgh
    Broken-by: bdcc6f2bd5
    (Cherry-picked from: 0e0e171628)

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 015959cb6ff93154ea58fc0db9977058df972425..621d5b1b582f4c52545ad4c42c1f5881b3ee473f 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -17,6 +17,10 @@ JH/03 Bug 2586: Fix listcount expansion operator.  Using tainted arguments is
       "log_reject_target", "malware" and "spam"; the arguments are expanded
       so could be handling tainted values.
 
+JH/04 Bug 2590: Fix -bi (newaliases).  A previous code rearrangement had
+      broken the (no-op) support for this sendmail command.  Restore it
+      to doing nothing, silently, and returning good status.
+
 
 Exim version 4.94
 -----------------

diff --git a/src/src/exim.c b/src/src/exim.c
index a60488e953a9ce2d858e476db1aa0f6f47a2c408..6143fe9897194f9a91220840954100f1b2e58636 100644 (file)
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -2148,7 +2148,7 @@ on the second character (the one after '-'), to save some effort. */
        concept of *the* alias file, but since Sun's YP make script calls
        sendmail this way, some support must be provided. */
        case 'i':
-         if (!*++argrest) bi_option = TRUE;
+         if (!*argrest) bi_option = TRUE;
          else badarg = TRUE;
          break;