chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v231: Apply missing fixes from upstream (1/6) src/basic
[elogind.git]
/
src
/
basic
/
user-util.c
diff --git
a/src/basic/user-util.c
b/src/basic/user-util.c
index 397880b0b1d605e18f98ccf158f8c36cf3885a9f..fbe9f2a969987f86b225bd3a170173c0698aa7d5 100644
(file)
--- 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.
/***
This file is part of systemd.
@@
-19,17
+17,28
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include <alloca.h>
+#include <errno.h>
+#include <fcntl.h>
#include <grp.h>
#include <pwd.h>
#include <grp.h>
#include <pwd.h>
-
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include "missing.h"
#include "alloc-util.h"
#include "fd-util.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 "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) {
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
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)
* strings. */
if (ret)
@@
-79,6
+88,7
@@
char* getlogname_malloc(void) {
return uid_to_name(uid);
}
return uid_to_name(uid);
}
+#if 0 /// UNNEEDED by elogind
char *getusername_malloc(void) {
const char *e;
char *getusername_malloc(void) {
const char *e;
@@
-88,6
+98,7
@@
char *getusername_malloc(void) {
return uid_to_name(getuid());
}
return uid_to_name(getuid());
}
+#endif // 0
int get_user_creds(
const char **username,
int get_user_creds(
const char **username,
@@
-283,6
+294,7
@@
char* gid_to_name(gid_t gid) {
return ret;
}
return ret;
}
+#if 0 /// UNNEEDED by elogind
int in_gid(gid_t gid) {
gid_t *gids;
int ngroups_max, r, i;
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;
}
*_s = s;
return 0;
}
+#endif // 0
int reset_uid_gid(void) {
int reset_uid_gid(void) {
@@
-431,6
+444,7
@@
int reset_uid_gid(void) {
return 0;
}
return 0;
}
+#if 0 /// UNNEEDED by elogind
int take_etc_passwd_lock(const char *root) {
struct flock flock = {
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
*
* 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. */
* 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;
}
return fd;
}
+#endif // 0