SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move {uid,gid}_is_*() from basic to shared

Browse Source 
Those are functions that express policy, and nothing in basic/ uses
(or should use) them.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2020-09-25 17:18:56 +02:00
parent 960b585ba1
commit 98dcb8f4c7
7 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/user-util.h
+1 -25
View File
@@ -3,7 +3,7 @@
#include <grp.h>
#if ENABLE_GSHADOW
#include <gshadow.h>
# include <gshadow.h>
#endif
#include <pwd.h>
#include <shadow.h>
@@ -61,30 +61,6 @@ int take_etc_passwd_lock(const char *root);
#define ETC_PASSWD_LOCK_PATH "/etc/.pwd.lock"
static inline bool uid_is_system(uid_t uid) {
return uid <= SYSTEM_UID_MAX;
}
static inline bool gid_is_system(gid_t gid) {
return gid <= SYSTEM_GID_MAX;
}
static inline bool uid_is_dynamic(uid_t uid) {
return DYNAMIC_UID_MIN <= uid && uid <= DYNAMIC_UID_MAX;
}
static inline bool gid_is_dynamic(gid_t gid) {
return uid_is_dynamic((uid_t) gid);
}
static inline bool uid_is_container(uid_t uid) {
return CONTAINER_UID_BASE_MIN <= uid && uid <= CONTAINER_UID_BASE_MAX;
}
static inline bool gid_is_container(gid_t gid) {
return uid_is_container((uid_t) gid);
}
/* The following macros add 1 when converting things, since UID 0 is a valid UID, while the pointer
* NULL is special */
#define PTR_TO_UID(p) ((uid_t) (((uintptr_t) (p))-1))