| Message ID | 20221004145142.19091-1-gert@greenie.muc.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [Openvpn-devel] use boolean '||' to join two bools, not bitwise '|' | expand |
Hi, On 04/10/2022 16:51, Gert Doering wrote: > FreeBSD 14 clang complains about this: and it is right. > > init.c:3530:13: warning: use of bitwise '|' with boolean operands [-Wbitwise-instead-of-logical] > platform_group_get(c->options.groupname, &c0->platform_state_group) > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > init.c:3530:13: note: cast one or both operands to int to silence this warning > 1 warning generated. > > .. so do what it wants us to do. > > Signed-off-by: Gert Doering <gert@greenie.muc.de> Acked-by: Antonio Quartulli <a@unstable.cc> > --- > src/openvpn/init.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/openvpn/init.c b/src/openvpn/init.c > index 03416844..c88c0915 100644 > --- a/src/openvpn/init.c > +++ b/src/openvpn/init.c > @@ -3528,7 +3528,7 @@ do_init_first_time(struct context *c) > /* get user and/or group that we want to setuid/setgid to */ > c0->uid_gid_specified = > platform_group_get(c->options.groupname, &c0->platform_state_group) > - |platform_user_get(c->options.username, &c0->platform_state_user); > + || platform_user_get(c->options.username, &c0->platform_state_user); > > /* perform postponed chdir if --daemon */ > if (c->did_we_daemonize && c->options.cd_dir == NULL)
For sanity reasons, tested on the oldest system I have around
(FreeBSD 7.4). No complaints (none expected).
Patch has been applied to the master branch.
commit facb6fffb35f51e67eefaab8ba357b676b3c6328
Author: Gert Doering
Date: Tue Oct 4 16:51:42 2022 +0200
use boolean '||' to join two bools, not bitwise '|'
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Acked-by: Antonio Quartulli <a@unstable.cc>
Message-Id: <20221004145142.19091-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg25333.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
--
kind regards,
Gert Doering
diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 03416844..c88c0915 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -3528,7 +3528,7 @@ do_init_first_time(struct context *c) /* get user and/or group that we want to setuid/setgid to */ c0->uid_gid_specified = platform_group_get(c->options.groupname, &c0->platform_state_group) - |platform_user_get(c->options.username, &c0->platform_state_user); + || platform_user_get(c->options.username, &c0->platform_state_user); /* perform postponed chdir if --daemon */ if (c->did_we_daemonize && c->options.cd_dir == NULL)
FreeBSD 14 clang complains about this: init.c:3530:13: warning: use of bitwise '|' with boolean operands [-Wbitwise-instead-of-logical] platform_group_get(c->options.groupname, &c0->platform_state_group) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ init.c:3530:13: note: cast one or both operands to int to silence this warning 1 warning generated. .. so do what it wants us to do. Signed-off-by: Gert Doering <gert@greenie.muc.de> --- src/openvpn/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)