From: Baptiste Assmann <bedis9@gmail.com>
Date: Mon, 17 Aug 2015 12:25:02 +0000 (+0200)
Subject: MINOR: server SRV_ADMF_CMAINT flag doesn't imply SRV_ADMF_FMAINT
X-Git-Tag: v1.6-dev4~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93c20623dbbac12c0eed411faba94c08b04cf329;p=thirdparty%2Fhaproxy.git

MINOR: server SRV_ADMF_CMAINT flag doesn't imply SRV_ADMF_FMAINT

The newly created server flag SRV_ADMF_CMAINT means that the server is
in 'disabled' mode because of configuration statement 'disabled'.
The flag SRV_ADMF_FMAINT should not be set anymore in such case and is
reserved only when the server is Forced in maintenance mode from the
stats socket.
---

diff --git a/src/server.c b/src/server.c
index 5a3f60ae75..1e24551ec7 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1295,7 +1295,6 @@ int parse_server(const char *file, int linenum, char **args, struct proxy *curpr
 			}
 			else if (!defsrv && !strcmp(args[cur_arg], "disabled")) {
 				newsrv->admin |= SRV_ADMF_CMAINT;
-				newsrv->admin |= SRV_ADMF_FMAINT;
 				newsrv->state = SRV_ST_STOPPED;
 				newsrv->check.state |= CHK_ST_PAUSED;
 				newsrv->check.health = 0;