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 139651714b013de0b138ea65cf4ff7ee21857e57..75f50ae347ea45db371ef0539dbf5baf635788ba 100644 (file)
--- 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 */