Fix regression of ignoring --user
PATCH 1/1 Fix regression of ignoring --user
Commit facb6fffb changed a call in the style of if(a() | b()) to if(a() || b()). While this looks identical, it is not. The first statement always executes b() while the second only executes b() if a() returns false. This lead to to the platform_state_user never to set as side effect and thus --user being ignored. Rewrite the code to make this more explicit.
--- src/openvpn/init.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
src/openvpn/init.c +8 -4
@@ -3597,10 +3597,14 @@ do_init_first_time(struct context *c) ALLOC_OBJ_CLEAR_GC(c->c0, struct context_0, &c->gc); c0 = c->c0; -/* 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); +/* get user and/or group that we want to setuid/setgid to, +* sets also platform_x_state */ +bool group_defined =platform_group_get (c->options.groupname, + &c0->platform_state_group); +bool user_defined =platform_user_get (c->options.username, + &c0->platform_state_user); + + c0->uid_gid_specified = user_defined || group_defined;/* perform postponed chdir if --daemon */ if (c->did_we_daemonize && c->options.cd_dir ==NULL )
Signature · 1 line
2.37.0 (Apple Git-136)
Glad that this obscure AS option caught this breakage... *sigh* - that's what you get for "just fix this compiler warning" (which I am usually quite reluctant to do, but "it looked straightforward enough").
The new code is less magic, and much easier to understand - good.
Lightly tested only ("run one instance with --user or --group, see if log and ps output agree").
Your patch has been applied to the master branch.
commit 66f6a3b7991d5316116ce7cb91dfa4d71d4df42f
Author: Arne Schwabe Date: Wed Oct 19 15:36:27 2022 +0200
Fix regression of ignoring --user
Signed-off-by: Arne Schwabe <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg25430.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering