From: Frank Lichtenheld <fr...@lichtenheld.com> Both values are boolean so there is no reason to use "|" and it just confuses the reader whether there is something more going on here.
Change-Id: Ie61fa6a78875ecbaa9d3d8e7a50603d77c9ce09e Signed-off-by: Frank Lichtenheld <fr...@lichtenheld.com> Acked-by: Gert Doering <g...@greenie.muc.de> --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/553 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering <g...@greenie.muc.de> diff --git a/src/openvpn/helper.c b/src/openvpn/helper.c index 1bab84c..24dee97 100644 --- a/src/openvpn/helper.c +++ b/src/openvpn/helper.c @@ -427,7 +427,7 @@ * if !nogw: * push "route-gateway dhcp" */ - else if (o->server_bridge_defined | o->server_bridge_proxy_dhcp) + else if (o->server_bridge_defined || o->server_bridge_proxy_dhcp) { if (o->client) { diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 02205e7..e67f10e 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -3565,7 +3565,7 @@ msg(M_WARN, "WARNING: using --pull/--client and --ifconfig together is probably not what you want"); } - if (o->server_bridge_defined | o->server_bridge_proxy_dhcp) + if (o->server_bridge_defined || o->server_bridge_proxy_dhcp) { msg(M_WARN, "NOTE: when bridging your LAN adapter with the TAP adapter, note that the new bridge adapter will often take on its own IP address that is different from what the LAN adapter was previously set to"); } _______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
