X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbasic%2Fuser-util.h;h=5d1d0abe4d1c960f12eda860335bd90453193e0b;hb=7b4a8335022121d06336eae363f3d7fcbcac1c45;hp=11ff6674cf5b7272989c9ce76b9223951e8c3691;hpb=b96ed50e3493103d075ff2ce4c3fbad8f26b2e22;p=elogind.git
diff --git a/src/basic/user-util.h b/src/basic/user-util.h
index 11ff6674c..5d1d0abe4 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);
@@ -37,7 +36,9 @@ static inline int parse_gid(const char *s, gid_t *ret_gid) {
}
char* getlogname_malloc(void);
+#if 0 /// UNNEEDED by elogind
char* getusername_malloc(void);
+#endif // 0
int get_user_creds(const char **username, uid_t *uid, gid_t *gid, const char **home, const char **shell);
int get_group_creds(const char **groupname, gid_t *gid);
@@ -45,15 +46,19 @@ int get_group_creds(const char **groupname, gid_t *gid);
char* uid_to_name(uid_t uid);
char* gid_to_name(gid_t gid);
+#if 0 /// UNNEEDED by elogind
int in_gid(gid_t gid);
int in_group(const char *name);
int get_home_dir(char **ret);
int get_shell(char **_ret);
+#endif // 0
int reset_uid_gid(void);
+#if 0 /// UNNEEDED by elogind
int take_etc_passwd_lock(const char *root);
+#endif // 0
#define UID_INVALID ((uid_t) -1)
#define GID_INVALID ((gid_t) -1)
@@ -65,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;
+}