X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbasic%2Fuser-util.h;h=d010b2bf505606e0b1f1613bb743600279773fce;hb=5489ba3e334d21609a042d5dc1615323f2903181;hp=235d0769aa1db2d2b390555be43f8e78ba1d530a;hpb=20e696d0ded4e2f95ab20e95b148c806a3112949;p=elogind.git diff --git a/src/basic/user-util.h b/src/basic/user-util.h index 235d0769a..d010b2bf5 100644 --- a/src/basic/user-util.h +++ b/src/basic/user-util.h @@ -1,5 +1,3 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - #pragma once /*** @@ -21,8 +19,9 @@ along with systemd; If not, see . ***/ -#include #include +#include +#include bool uid_is_valid(uid_t uid); @@ -36,8 +35,7 @@ static inline int parse_gid(const char *s, gid_t *ret_gid) { return parse_uid(s, (uid_t*) ret_gid); } -/// UNNEEDED by elogind -#if 0 +#if 0 /// UNNEEDED by elogind char* getlogname_malloc(void); char* getusername_malloc(void); #endif // 0 @@ -48,8 +46,7 @@ int get_group_creds(const char **groupname, gid_t *gid); char* uid_to_name(uid_t uid); char* gid_to_name(gid_t gid); -/// UNNEEDED by elogind -#if 0 +#if 0 /// UNNEEDED by elogind int in_gid(gid_t gid); int in_group(const char *name); @@ -59,8 +56,7 @@ int get_shell(char **_ret); int reset_uid_gid(void); -/// UNNEEDED by elogind -#if 0 +#if 0 /// UNNEEDED by elogind int take_etc_passwd_lock(const char *root); #endif // 0 @@ -74,3 +70,7 @@ 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; +}