[PATCH] Disable master_worker if -d is specified on the command line

[Simon Horman]

---
 src/haproxy.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/haproxy.c b/src/haproxy.c
index 94adcf9..7ff1e82 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -707,9 +707,12 @@ void init(int argc, char **argv)
                                    MODE_VERBOSE | MODE_DEBUG |
                                    MODE_MASTER_WORKER));
 
-       if ((global.mode & MODE_DEBUG) && (global.mode & (MODE_DAEMON | 
MODE_QUIET))) {
-               Warning("<debug> mode incompatible with <quiet> and <daemon>. 
Keeping <debug> only.\n");
-               global.mode &= ~(MODE_DAEMON | MODE_QUIET);
+       if ((global.mode & MODE_DEBUG) &&
+           (global.mode & (MODE_DAEMON | MODE_MASTER_WORKER | MODE_QUIET))) {
+               Warning("<debug> mode incompatible with <daemon>, "
+                       "<master_worker> and <daemon>. "
+                       "Keeping <debug> only.\n");
+               global.mode &= ~(MODE_DAEMON | MODE_MASTER_WORKER | MODE_QUIET);
        }
 
        if ((global.nbproc > 1) &&
-- 
1.7.2.3