From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 23 Mar 2025 21:52:10 +0000 (+0100)
Subject: user-record: Allow/strip status for mask/extract privileged helpers
X-Git-Tag: v258-rc1~1018
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d2c1242c6d08a1a5deb8eccea4833f43234df010;p=thirdparty%2Fsystemd.git

user-record: Allow/strip status for mask/extract privileged helpers

If we're using these helpers, we want to split a user record into two,
one with the privileged section, and one without. This should work even
when the user record has a "status" section, so adapt the helpers to
account for that.
---

diff --git a/src/shared/user-record.h b/src/shared/user-record.h
index 139651714b0..75f50ae347e 100644
--- a/src/shared/user-record.h
+++ b/src/shared/user-record.h
@@ -136,12 +136,14 @@ typedef enum UserRecordLoadFlags {
                                            USER_RECORD_STRIP_PRIVILEGED|
                                            USER_RECORD_ALLOW_PER_MACHINE|
                                            USER_RECORD_ALLOW_BINDING|
+                                           USER_RECORD_ALLOW_STATUS|
                                            USER_RECORD_ALLOW_SIGNATURE,
 
         USER_RECORD_EXTRACT_PRIVILEGED   = USER_RECORD_STRIP_REGULAR|
                                            USER_RECORD_ALLOW_PRIVILEGED|
                                            USER_RECORD_STRIP_PER_MACHINE|
                                            USER_RECORD_STRIP_BINDING|
+                                           USER_RECORD_STRIP_STATUS|
                                            USER_RECORD_STRIP_SIGNATURE,
 
         /* Whether to log about loader errors beyond LOG_DEBUG */