From: Willy Tarreau <w@1wt.eu>
Date: Sun, 1 Mar 2009 07:27:21 +0000 (+0100)
Subject: [BUG] the "source" keyword must first clear optional settings
X-Git-Tag: v1.3.15.8~3
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=15b939fbdd5885b6814454c273e64b8cd348b59d;p=haproxy.git

[BUG] the "source" keyword must first clear optional settings

Problem reported by John Lauro. When "source ... usesrc ..." is
set in the defaults section, it is not possible anymore to remove
the "usesrc" part when declaring a more precise "source" in a
backend. The only workaround was to declare it by server.

We need to clear optional settings when declaring a new "source".
(cherry picked from commit 368480cf4570a0d6448741c704aebd53ac467aa9)
---

diff --git a/src/cfgparse.c b/src/cfgparse.c
index d09d6da79..d01b4754a 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -1903,7 +1903,10 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int inv)
 #endif
 			return -1;
 		}
-	
+
+		/* we must first clear any optional default setting */	
+		curproxy->options &= ~PR_O_TPXY_MASK;
+
 		curproxy->source_addr = *str2sa(args[1]);
 		curproxy->options |= PR_O_BIND_SRC;
 		if (!strcmp(args[2], "usesrc")) {  /* address to use outside */