diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-10-27 00:42:07 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-10-27 13:25:57 +0100 |
| commit | ee104e11e303499a637c5cd8157bd12ad5cc116d (patch) | |
| tree | 9b5e194fd5e21d476cc60ae5a6dd125608278953 /src/shared | |
| parent | 49cf4170d0b586551527ebf4297f8a3fe6bd71a3 (diff) | |
user-util: move UID/GID related macros from macro.h to user-util.h
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/base-filesystem.c | 1 | ||||
| -rw-r--r-- | src/shared/bus-util.c | 3 | ||||
| -rw-r--r-- | src/shared/dev-setup.c | 5 | ||||
| -rw-r--r-- | src/shared/switch-root.c | 1 |
4 files changed, 7 insertions, 3 deletions
diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c index 9ccf26526f..ff91c6bdc5 100644 --- a/src/shared/base-filesystem.c +++ b/src/shared/base-filesystem.c @@ -30,6 +30,7 @@ #include "macro.h" #include "string-util.h" #include "umask-util.h" +#include "user-util.h" #include "util.h" typedef struct BaseFilesystem { diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index c854ff4344..b253eb95ee 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -39,6 +39,7 @@ #include "missing.h" #include "parse-util.h" #include "path-util.h" +#include "proc-cmdline.h" #include "rlimit-util.h" #include "set.h" #include "signal-util.h" @@ -46,9 +47,9 @@ #include "strv.h" #include "syslog-util.h" #include "unit-name.h" +#include "user-util.h" #include "utf8.h" #include "util.h" -#include "proc-cmdline.h" static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { sd_event *e = userdata; diff --git a/src/shared/dev-setup.c b/src/shared/dev-setup.c index 25ad918b85..0d321af967 100644 --- a/src/shared/dev-setup.c +++ b/src/shared/dev-setup.c @@ -23,10 +23,11 @@ #include <stdlib.h> #include <unistd.h> -#include "util.h" +#include "dev-setup.h" #include "label.h" #include "path-util.h" -#include "dev-setup.h" +#include "user-util.h" +#include "util.h" int dev_setup(const char *prefix, uid_t uid, gid_t gid) { static const char symlinks[] = diff --git a/src/shared/switch-root.c b/src/shared/switch-root.c index 60d7043fda..fc885f6cb8 100644 --- a/src/shared/switch-root.c +++ b/src/shared/switch-root.c @@ -35,6 +35,7 @@ #include "rm-rf.h" #include "string-util.h" #include "switch-root.h" +#include "user-util.h" #include "util.h" int switch_root(const char *new_root, const char *oldroot, bool detach_oldroot, unsigned long mountflags) { |