Re: [PATCH] BUILD: fix for non-transparent builds

2017-04-10 Thread Willy Tarreau
Hi Steven,

On Thu, Apr 06, 2017 at 04:02:36PM -0700, Steven Davidovitz wrote:
> Broke in dba9707713eb49a39b218f331c252fb09494c566.

Strange, what OS/build options are you using ? Also, the commit above
doesn't seem to exist so it's not easy to find the extent of the issue.

Willy



[PATCH] BUILD: fix for non-transparent builds

2017-04-06 Thread Steven Davidovitz
Broke in dba9707713eb49a39b218f331c252fb09494c566.
---
 src/server.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/server.c b/src/server.c
index 23343d86..536bf853 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1742,12 +1742,14 @@ int parse_server(const char *file, int linenum, char 
**args, struct proxy *curpr
}
}
}
+#if defined(CONFIG_HAP_TRANSPARENT)
if (curproxy->defsrv.conn_src.bind_hdr_name != NULL) {
newsrv->conn_src.bind_hdr_name = 
strdup(curproxy->defsrv.conn_src.bind_hdr_name);
newsrv->conn_src.bind_hdr_len = 
strlen(curproxy->defsrv.conn_src.bind_hdr_name);
}
newsrv->conn_src.bind_hdr_occ = 
curproxy->defsrv.conn_src.bind_hdr_occ;
newsrv->conn_src.tproxy_addr = 
curproxy->defsrv.conn_src.tproxy_addr;
+#endif
if (curproxy->defsrv.conn_src.iface_name != NULL)
newsrv->conn_src.iface_name = 
strdup(curproxy->defsrv.conn_src.iface_name);
 
-- 
2.11.1