]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: server SRV_ADMF_CMAINT flag doesn't imply SRV_ADMF_FMAINT
authorBaptiste Assmann <bedis9@gmail.com>
Mon, 17 Aug 2015 12:25:02 +0000 (14:25 +0200)
committerWilly Tarreau <w@1wt.eu>
Mon, 17 Aug 2015 13:42:07 +0000 (15:42 +0200)
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.

src/server.c

index 5a3f60ae75b95fac026a9d708622c0bf362d13be..1e24551ec77fdb944a456d5eb0019231e4f24a09 100644 (file)
@@ -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;