X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fbasic%2Fuser-util.c;h=006a73e59ad24ab75311a91fa97217d45c895633;hp=97ff2af4a121d6da72eb43d2d81b6631cbb7817b;hb=66ecc207e203db5434610395cd04c40ae8727b58;hpb=bccdfb431a266e7671d518fd5a42362a5ce724c9
diff --git a/src/basic/user-util.c b/src/basic/user-util.c
index 97ff2af4a..006a73e59 100644
--- a/src/basic/user-util.c
+++ b/src/basic/user-util.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
@@ -19,17 +17,27 @@
along with systemd; If not, see .
***/
+#include
+#include
+#include
#include
#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
#include "alloc-util.h"
#include "fd-util.h"
+#include "formats-util.h"
#include "macro.h"
#include "parse-util.h"
#include "path-util.h"
#include "string-util.h"
#include "user-util.h"
-#include "util.h"
bool uid_is_valid(uid_t uid) {
@@ -58,7 +66,7 @@ int parse_uid(const char *s, uid_t *ret) {
if (!uid_is_valid(uid))
return -ENXIO; /* we return ENXIO instead of EINVAL
* here, to make it easy to distuingish
- * invalid numeric uids invalid
+ * invalid numeric uids from invalid
* strings. */
if (ret)
@@ -67,8 +75,7 @@ int parse_uid(const char *s, uid_t *ret) {
return 0;
}
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
char* getlogname_malloc(void) {
uid_t uid;
struct stat st;
@@ -286,8 +293,7 @@ char* gid_to_name(gid_t gid) {
return ret;
}
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
int in_gid(gid_t gid) {
gid_t *gids;
int ngroups_max, r, i;
@@ -437,8 +443,7 @@ int reset_uid_gid(void) {
return 0;
}
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
int take_etc_passwd_lock(const char *root) {
struct flock flock = {