diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c index 1b28fbd8e..eac047051 100644 --- a/src/cfgparse-listen.c +++ b/src/cfgparse-listen.c @@ -1365,7 +1365,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm) if (curproxy->cap & PR_CAP_BE) where |= SMP_VAL_BE_HRQ_HDR; err_code |= warnif_cond_conflicts(rule->cond, where, &errmsg); - if (err_code) + if (errmsg && *errmsg) ha_warning("parsing [%s:%d] : '%s.\n'", file, linenum, errmsg); LIST_APPEND(&curproxy->http_req_rules, &rule->list); @@ -1400,7 +1400,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm) if (curproxy->cap & PR_CAP_BE) where |= SMP_VAL_BE_HRS_HDR; err_code |= warnif_cond_conflicts(rule->cond, where, &errmsg); - if (err_code) + if (errmsg && *errmsg) ha_warning("parsing [%s:%d] : '%s.\n'", file, linenum, errmsg); LIST_APPEND(&curproxy->http_res_rules, &rule->list); @@ -1434,7 +1434,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm) if (curproxy->cap & PR_CAP_BE) where |= SMP_VAL_BE_HRS_HDR; err_code |= warnif_cond_conflicts(rule->cond, where, &errmsg); - if (err_code) + if (errmsg && *errmsg) ha_warning("parsing [%s:%d] : '%s.\n'", file, linenum, errmsg); LIST_APPEND(&curproxy->http_after_res_rules, &rule->list); @@ -1498,7 +1498,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm) if (curproxy->cap & PR_CAP_BE) where |= SMP_VAL_BE_HRQ_HDR; err_code |= warnif_cond_conflicts(rule->cond, where, &errmsg); - if (err_code) + if (errmsg && *errmsg) ha_warning("parsing [%s:%d] : '%s.\n'", file, linenum, errmsg); } else if (strcmp(args[0], "use_backend") == 0) { @@ -1528,7 +1528,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm) } err_code |= warnif_cond_conflicts(cond, SMP_VAL_FE_SET_BCK, &errmsg); - if (err_code) + if (errmsg && *errmsg) ha_warning("parsing [%s:%d] : '%s.\n'", file, linenum, errmsg); } else if (*args[2]) { @@ -1591,7 +1591,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm) } err_code |= warnif_cond_conflicts(cond, SMP_VAL_BE_SET_SRV, &errmsg); - if (err_code) + if (errmsg && *errmsg) ha_warning("parsing [%s:%d] : '%s.\n'", file, linenum, errmsg); rule = calloc(1, sizeof(*rule)); @@ -1646,7 +1646,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm) * where force-persist is applied. */ err_code |= warnif_cond_conflicts(cond, SMP_VAL_BE_REQ_CNT, &errmsg); - if (err_code) + if (errmsg && *errmsg) ha_warning("parsing [%s:%d] : '%s.\n'", file, linenum, errmsg); rule = calloc(1, sizeof(*rule)); @@ -1814,7 +1814,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm) err_code |= warnif_cond_conflicts(cond, SMP_VAL_BE_STO_RUL, &errmsg); else err_code |= warnif_cond_conflicts(cond, SMP_VAL_BE_SET_SRV, &errmsg); - if (err_code) + if (errmsg && *errmsg) ha_warning("parsing [%s:%d] : '%s.\n'", file, linenum, errmsg); rule = calloc(1, sizeof(*rule)); @@ -1872,7 +1872,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm) if (curproxy->cap & PR_CAP_BE) where |= SMP_VAL_BE_HRQ_HDR; err_code |= warnif_cond_conflicts(cond, where, &errmsg); - if (err_code) + if (errmsg && *errmsg) ha_warning("parsing [%s:%d] : '%s.\n'", file, linenum, errmsg); rule = calloc(1, sizeof(*rule)); @@ -1952,7 +1952,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm) if (curproxy->cap & PR_CAP_BE) where |= SMP_VAL_BE_HRQ_HDR; err_code |= warnif_cond_conflicts(rule->cond, where, &errmsg); - if (err_code) + if (errmsg && *errmsg) ha_warning("parsing [%s:%d] : '%s.\n'", file, linenum, errmsg); LIST_APPEND(&curproxy->uri_auth->http_req_rules, &rule->list);