From: Willy Tarreau Date: Thu, 3 Nov 2016 17:33:25 +0000 (+0100) Subject: BUG/MINOR: srv-state: allow to have both CMAINT and FDRAIN flags X-Git-Tag: v1.7-dev6~44 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e1bde1492a30f5036ca58248e50c27a9e116d9cc;p=thirdparty%2Fhaproxy.git BUG/MINOR: srv-state: allow to have both CMAINT and FDRAIN flags CMAINT indicates that the server was *initially* disabled in the configuration via the "disabled" keyword. FDRAIN indicates that the server was switched to the DRAIN state from the CLI or the agent. This it's perfectly valid to have both of them in the state file, so the parser must not reject this combination. This fix must be backported to 1.6. --- diff --git a/src/server.c b/src/server.c index 8150c692d1..3be2bc8291 100644 --- a/src/server.c +++ b/src/server.c @@ -2029,6 +2029,7 @@ static void srv_update_state(struct server *srv, int version, char **params) srv_admin_state != SRV_ADMF_IMAINT && srv_admin_state != SRV_ADMF_CMAINT && srv_admin_state != (SRV_ADMF_CMAINT | SRV_ADMF_FMAINT) && + srv_admin_state != (SRV_ADMF_CMAINT | SRV_ADMF_FDRAIN) && srv_admin_state != SRV_ADMF_FDRAIN && srv_admin_state != SRV_ADMF_IDRAIN)) { chunk_appendf(msg, ", invalid srv_admin_state value '%s'", params[2]);