basic: Move userns_supported() to namespace-util.h

This commit is contained in:
Daan De Meyer
2025-05-25 10:00:54 +02:00
parent 01655aec3b
commit 1aabcd7454
3 changed files with 5 additions and 4 deletions

View File

@@ -644,6 +644,10 @@ int userns_enter_and_pin(int userns_fd, pid_t *ret_pid) {
return 0;
}
bool userns_supported(void) {
return access("/proc/self/uid_map", F_OK) >= 0;
}
int userns_get_base_uid(int userns_fd, uid_t *ret_uid, gid_t *ret_gid) {
_cleanup_(sigkill_waitp) pid_t pid = 0;
int r;

View File

@@ -91,6 +91,7 @@ int userns_acquire_empty(void);
int userns_acquire(const char *uid_map, const char *gid_map, bool setgroups_deny);
int userns_acquire_self_root(void);
int userns_enter_and_pin(int userns_fd, pid_t *ret_pid);
bool userns_supported(void);
int userns_get_base_uid(int userns_fd, uid_t *ret_uid, gid_t *ret_gid);

View File

@@ -106,10 +106,6 @@ int take_etc_passwd_lock(const char *root);
#define PTR_TO_GID(p) ((gid_t) (((uintptr_t) (p))-1))
#define GID_TO_PTR(u) ((void*) (((uintptr_t) (u))+1))
static inline bool userns_supported(void) {
return access("/proc/self/uid_map", F_OK) >= 0;
}
typedef enum ValidUserFlags {
VALID_USER_RELAX = 1 << 0,
VALID_USER_WARN = 1 << 1,