From: Willy Tarreau <w@1wt.eu>
Date: Tue, 30 Mar 2010 18:13:29 +0000 (+0200)
Subject: [BUILD] config: last patch breaks build without CONFIG_HAP_LINUX_TPROXY
X-Git-Tag: v1.4.4~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=efa5f51f00317d2f8e765c07081019c2f2440e27;p=thirdparty%2Fhaproxy.git

[BUILD] config: last patch breaks build without CONFIG_HAP_LINUX_TPROXY

A few ifdefs were missing in the config validity check function.
---

diff --git a/src/cfgparse.c b/src/cfgparse.c
index f3783d4169..6af60da6c5 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -5134,12 +5134,14 @@ out_uri_auth_compat:
 				}
 			}
 
+#if defined(CONFIG_HAP_CTTPROXY) || defined(CONFIG_HAP_LINUX_TPROXY)
 			if (curproxy->bind_hdr_occ) {
 				curproxy->bind_hdr_occ = 0;
 				Warning("config : %s '%s' : ignoring use of header %s as source IP in non-HTTP mode.\n",
 					proxy_type_str(curproxy), curproxy->id, curproxy->bind_hdr_name);
 				err_code |= ERR_WARN;
 			}
+#endif
 		}
 
 		/*
@@ -5164,12 +5166,14 @@ out_uri_auth_compat:
 				cfgerr++;
 			}
 
+#if defined(CONFIG_HAP_CTTPROXY) || defined(CONFIG_HAP_LINUX_TPROXY)
 			if (curproxy->mode != PR_MODE_HTTP && newsrv->bind_hdr_occ) {
 				newsrv->bind_hdr_occ = 0;
 				Warning("config : %s '%s' : server %s cannot use header %s as source IP in non-HTTP mode.\n",
 					proxy_type_str(curproxy), curproxy->id, newsrv->id, newsrv->bind_hdr_name);
 				err_code |= ERR_WARN;
 			}
+#endif
 			newsrv = newsrv->next;
 		}