Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/553?usp=email
to review the following change.
Change subject: Fix "binary or" vs "boolean or" related to
server_bridge_proxy_dhcp
......................................................................
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 <fr...@lichtenheld.com>
---
M src/openvpn/helper.c
M src/openvpn/init.c
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/53/553/1
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");
}
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/553?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ie61fa6a78875ecbaa9d3d8e7a50603d77c9ce09e
Gerrit-Change-Number: 553
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <fr...@lichtenheld.com>
Gerrit-Reviewer: plaisthos <arne-open...@rfc2549.org>
Gerrit-CC: openvpn-devel <openvpn-devel@lists.sourceforge.net>
Gerrit-Attention: plaisthos <arne-open...@rfc2549.org>
Gerrit-MessageType: newchange
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
