Hi, On Thu, Aug 11, 2022 at 12:03:45PM +0200, Gert Doering wrote: > Uncrustify complained about two lines with tabs -> fixed.
Turns out that it's actually 4 lines, and while I did "git apply $patch",
I forgot the "git commit --amend platform.c", so the whitespace errors
landed in the commit, and the *fix* was still sitting in my tree.
Since this is just whitespace, I'll merge the patch as follows,
into
commit 649874df9edb52a9d85bf9db690b6150fdb6dcc9 (HEAD -> master)
Author: Gert Doering <g...@greenie.muc.de>
Date: Thu Aug 11 13:26:58 2022 +0200
Apply uncrustify changes that forgotten in the last patch.
gert
--
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress
Gert Doering - Munich, Germany g...@greenie.muc.de
From 649874df9edb52a9d85bf9db690b6150fdb6dcc9 Mon Sep 17 00:00:00 2001
From: Gert Doering <g...@greenie.muc.de>
Date: Thu, 11 Aug 2022 13:26:58 +0200
Subject: [PATCH] Apply uncrustify changes that forgotten in the last patch.
commit 2e359a088226ab1e5 has a few whitespace errors that uncrustify
complained on merge, but due to git handling mistakes, these were not
properly included in the actual commit. Fix.
Signed-off-by: Gert Doering <g...@greenie.muc.de>
---
src/openvpn/platform.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/openvpn/platform.c b/src/openvpn/platform.c
index e6778b3f..327a2d23 100644
--- a/src/openvpn/platform.c
+++ b/src/openvpn/platform.c
@@ -205,9 +205,10 @@ need_keep_caps(struct context *c)
* ==0: Don't attempt to retain any capabilities, just sitch user/group.
* <0: Try to retain capabilities, but continue on failure.
*/
-void platform_user_group_set(const struct platform_state_user *user_state,
- const struct platform_state_group *group_state,
- struct context *c)
+void
+platform_user_group_set(const struct platform_state_user *user_state,
+ const struct platform_state_group *group_state,
+ struct context *c)
{
int keep_caps = need_keep_caps(c);
unsigned int err_flags = (keep_caps > 0) ? M_FATAL : M_NONFATAL;
@@ -249,7 +250,7 @@ void platform_user_group_set(const struct platform_state_user *user_state,
if (res == -4 || res == -6)
{
/* -4 and -6 mean failure of setuid/gid respectively.
- There is no point for us to continue if those failed. */
+ * There is no point for us to continue if those failed. */
msg(M_ERR, "capng_change_id('%s','%s') failed: %d",
user_state->username, group_state->groupname, res);
}
@@ -268,11 +269,11 @@ void platform_user_group_set(const struct platform_state_user *user_state,
if (new_uid >= 0)
{
- msg(M_INFO, "UID set to %s", user_state->username);
+ msg(M_INFO, "UID set to %s", user_state->username);
}
if (new_gid >= 0)
{
- msg(M_INFO, "GID set to %s", group_state->groupname);
+ msg(M_INFO, "GID set to %s", group_state->groupname);
}
msg(M_INFO, "Capabilities retained: CAP_NET_ADMIN");
--
2.37.1
signature.asc
Description: PGP signature
_______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
