]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MINOR: server : no transparent proxy for DragonflyBSD
authorDavid Carlier <devnexen@gmail.com>
Fri, 7 Apr 2017 19:48:00 +0000 (20:48 +0100)
committerWilly Tarreau <w@1wt.eu>
Mon, 10 Apr 2017 13:27:46 +0000 (15:27 +0200)
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]

src/server.c

index 6070de93cacb7ff7bfe8c3ef24c42ea1fecc1f08..b5d889005e2d8cf255764553db52e4e3983bddf0 100644 (file)
@@ -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);