From: David Carlier Date: Fri, 7 Apr 2017 19:48:00 +0000 (+0100) Subject: BUG/MINOR: server : no transparent proxy for DragonflyBSD X-Git-Tag: v1.8-dev2~94 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a471935e6b83bc6172508eba9059e1262fd1ac3;p=thirdparty%2Fhaproxy.git BUG/MINOR: server : no transparent proxy for DragonflyBSD IP*_BINDANY is not defined under this system thus it is necessary to make those fields access since CONFIG_HAP_TRANSPARENT is not defined. [wt: problem introduced late in 1.8-dev. The same fix was also reported by Steven Davidovitz] --- diff --git a/src/server.c b/src/server.c index 6070de93ca..b5d889005e 100644 --- a/src/server.c +++ b/src/server.c @@ -1741,12 +1741,14 @@ int parse_server(const char *file, int linenum, char **args, struct proxy *curpr } } } +#ifdef 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);