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=fbe9f2a969987f86b225bd3a170173c0698aa7d5;hp=397880b0b1d605e18f98ccf158f8c36cf3885a9f;hb=cdc7b27bf58e294db71812932cd5f6f4a8dccc8b;hpb=b96ed50e3493103d075ff2ce4c3fbad8f26b2e22
diff --git a/src/basic/user-util.c b/src/basic/user-util.c
index 397880b0b..fbe9f2a96 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,28 @@
along with systemd; If not, see .
***/
+#include
+#include
+#include
#include
#include
-
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "missing.h"
#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 +67,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)
@@ -79,6 +88,7 @@ char* getlogname_malloc(void) {
return uid_to_name(uid);
}
+#if 0 /// UNNEEDED by elogind
char *getusername_malloc(void) {
const char *e;
@@ -88,6 +98,7 @@ char *getusername_malloc(void) {
return uid_to_name(getuid());
}
+#endif // 0
int get_user_creds(
const char **username,
@@ -283,6 +294,7 @@ char* gid_to_name(gid_t gid) {
return ret;
}
+#if 0 /// UNNEEDED by elogind
int in_gid(gid_t gid) {
gid_t *gids;
int ngroups_max, r, i;
@@ -416,6 +428,7 @@ int get_shell(char **_s) {
*_s = s;
return 0;
}
+#endif // 0
int reset_uid_gid(void) {
@@ -431,6 +444,7 @@ int reset_uid_gid(void) {
return 0;
}
+#if 0 /// UNNEEDED by elogind
int take_etc_passwd_lock(const char *root) {
struct flock flock = {
@@ -449,7 +463,7 @@ int take_etc_passwd_lock(const char *root) {
*
* Note that shadow-utils also takes per-database locks in
* addition to lckpwdf(). However, we don't given that they
- * are redundant as they they invoke lckpwdf() first and keep
+ * are redundant as they invoke lckpwdf() first and keep
* it during everything they do. The per-database locks are
* awfully racy, and thus we just won't do them. */
@@ -470,3 +484,4 @@ int take_etc_passwd_lock(const char *root) {
return fd;
}
+#endif // 0