From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Fri, 3 Jun 2022 14:34:03 +0000 (+0100)
Subject: SRS: fix mismerge
X-Git-Tag: exim-4.97-RC0~77
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/821be597760473fb60a45c3ad2b2659987b376cf?hp=de276ec5dcd0cdd8506430cbc2ee4d98e9d58a55

SRS: fix mismerge

Broken-by: 9f1a75f126
---

diff --git a/src/src/expand.c b/src/src/expand.c
index 3428179d8..45172b1ed 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -7047,6 +7047,7 @@ while (*s)
         case 2:
         case 3: goto EXPAND_FAILED;
         }
+      if (flags & ESI_SKIPPING) continue;
 
       if (sub[1] && *(sub[1]))
 	{