[exim-cvs] SRS: fix mismerge

Startseite
Nachricht löschen
Nachricht beantworten
Autor: Exim Git Commits Mailing List
Datum:  
To: exim-cvs
Betreff: [exim-cvs] SRS: fix mismerge
Gitweb: https://git.exim.org/exim.git/commitdiff/821be597760473fb60a45c3ad2b2659987b376cf
Commit:     821be597760473fb60a45c3ad2b2659987b376cf
Parent:     de276ec5dcd0cdd8506430cbc2ee4d98e9d58a55
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Fri Jun 3 15:34:03 2022 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Wed Jun 7 12:48:30 2023 +0100


    SRS: fix mismerge


    Broken-by: 9f1a75f126
---
 src/src/expand.c | 1 +
 1 file changed, 1 insertion(+)


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]))
     {


--
## subscription configuration (requires account):
## https://lists.exim.org/mailman3/postorius/lists/exim-cvs.lists.exim.org/
## unsubscribe (doesn't require an account):
## exim-cvs-unsubscribe@???
## Exim details at http://www.exim.org/
## Please use the Wiki with this list - http://wiki.exim.org/