From 9d92221eb4e773cae913752af6d70082ae305fe8 Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Thu, 2 May 2024 11:53:22 +0200 Subject: [PATCH] Fix 'binary or' vs 'boolean or' related to server_bridge_proxy_dhcp 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 Acked-by: Gert Doering Message-Id: <20240502095322.9433-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28601.html Signed-off-by: Gert Doering --- src/openvpn/helper.c | 2 +- src/openvpn/init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openvpn/helper.c b/src/openvpn/helper.c index 56817183..bbdbc041 100644 --- a/src/openvpn/helper.c +++ b/src/openvpn/helper.c @@ -454,7 +454,7 @@ helper_client_server(struct options *o) * 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 02205e7e..e67f10e3 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -3565,7 +3565,7 @@ do_option_warnings(struct context *c) 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"); }