X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fbasic%2Fuser-util.h;h=d010b2bf505606e0b1f1613bb743600279773fce;hp=87200a28cb5ca62b3ccfc06e10aa75f3fcc8129c;hb=5489ba3e334d21609a042d5dc1615323f2903181;hpb=bccdfb431a266e7671d518fd5a42362a5ce724c9

diff --git a/src/basic/user-util.h b/src/basic/user-util.h
index 87200a28c..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 <http://www.gnu.org/licenses/>.
 ***/
 
-#include <sys/types.h>
 #include <stdbool.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 bool uid_is_valid(uid_t uid);
 
@@ -36,8 +35,10 @@ static inline int parse_gid(const char *s, gid_t *ret_gid) {
         return parse_uid(s, (uid_t*) ret_gid);
 }
 
-// UNNEEDED char* getlogname_malloc(void);
-// UNNEEDED char* getusername_malloc(void);
+#if 0 /// UNNEEDED by elogind
+char* getlogname_malloc(void);
+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);
 
-// UNNEEDED int in_gid(gid_t gid);
-// UNNEEDED int in_group(const char *name);
+#if 0 /// UNNEEDED by elogind
+int in_gid(gid_t gid);
+int in_group(const char *name);
 
-// UNNEEDED int get_home_dir(char **ret);
-// UNNEEDED int get_shell(char **_ret);
+int get_home_dir(char **ret);
+int get_shell(char **_ret);
+#endif // 0
 
 int reset_uid_gid(void);
 
-// UNNEEDED int take_etc_passwd_lock(const char *root);
+#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 reset_uid_gid(void);
 
 #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;
+}