BUG/MINOR: mworker: post_section_parser for the last section in discovery

Previous patch 2c270a05f ("BUG/MINOR: mworker: section ignored in
discovery after a post_section_parser") needs an adjustment for the last
section of the file.

Indeed the post_section_parser of the last section must not be called in
discovery mode.

Must be backported in 3.1.

(cherry picked from commit 313eeae7dbcafac37ea6710c92de79c992c17d4c)
Signed-off-by: Willy Tarreau <w@1wt.eu>

diff --git a/src/cfgparse.c b/src/cfgparse.c
index a527cb6..0c0dd2f 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -2612,8 +2612,13 @@ section_parser:
        }
 
        ha_free(&global.cfg_curr_section);
-       if (cs && cs->post_section_parser)
-               err_code |= cs->post_section_parser();
+
+       /* call post_section_parser of the last section when there is no more lines */
+       if (cs && cs->post_section_parser) {
+               /* don't call post_section_parser in MODE_DISCOVERY */
+               if (!(global.mode & MODE_DISCOVERY))
+                       err_code |= cs->post_section_parser();
+       }
 
        if (nested_cond_lvl) {
                ha_alert("parsing [%s:%d]: non-terminated '.if' block.\n", file, linenum);