diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-10-25 22:32:30 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-10-26 01:24:38 +0100 |
| commit | b1d4f8e154bf61b5de1b27461ef8e9c8c5e838a1 (patch) | |
| tree | ca7a42f7604a837da6cfb80682d737beee34a219 /src/shared | |
| parent | c004493cdefc1f43a3956ca529e8070f8d70be56 (diff) | |
util-lib: split out user/group/uid/gid calls into user-util.[ch]
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/acl-util.c | 3 | ||||
| -rw-r--r-- | src/shared/install-printf.c | 5 | ||||
| -rw-r--r-- | src/shared/uid-range.c | 3 | ||||
| -rw-r--r-- | src/shared/utmp-wtmp.c | 1 |
4 files changed, 8 insertions, 4 deletions
diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c index 47295ae379..e8931daee2 100644 --- a/src/shared/acl-util.c +++ b/src/shared/acl-util.c @@ -22,10 +22,11 @@ #include <errno.h> #include <stdbool.h> +#include "acl-util.h" #include "string-util.h" #include "strv.h" +#include "user-util.h" #include "util.h" -#include "acl-util.h" int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry) { acl_entry_t i; diff --git a/src/shared/install-printf.c b/src/shared/install-printf.c index cbe984d2fb..224874f65c 100644 --- a/src/shared/install-printf.c +++ b/src/shared/install-printf.c @@ -21,11 +21,12 @@ #include <stdlib.h> +#include "formats-util.h" +#include "install-printf.h" #include "specifier.h" #include "unit-name.h" +#include "user-util.h" #include "util.h" -#include "install-printf.h" -#include "formats-util.h" static int specifier_prefix_and_instance(char specifier, void *data, void *userdata, char **ret) { UnitFileInstallInfo *i = userdata; diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c index 4794ff45bb..079dd8752c 100644 --- a/src/shared/uid-range.c +++ b/src/shared/uid-range.c @@ -19,8 +19,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "util.h" #include "uid-range.h" +#include "user-util.h" +#include "util.h" static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { assert(range); diff --git a/src/shared/utmp-wtmp.c b/src/shared/utmp-wtmp.c index 93e6313360..1e6ac2f27d 100644 --- a/src/shared/utmp-wtmp.c +++ b/src/shared/utmp-wtmp.c @@ -33,6 +33,7 @@ #include "path-util.h" #include "string-util.h" #include "terminal-util.h" +#include "user-util.h" #include "utmp-wtmp.h" int utmp_get_runlevel(int *runlevel, int *previous) { |