diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2014-10-29 05:02:56 -0700 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-11-26 19:11:37 -0500 |
| commit | 7f0a55d4325f7df91f91b3b818f61f97d78df14a (patch) | |
| tree | f88b96f4a0002b49749d78622fd174d54062e9f8 /src/sysusers | |
| parent | 3d82301321afdcc4f2f8786883bd15b1a64c6e83 (diff) | |
Introduce CONF_DIRS_NULSTR helper to define standard conf dirs
Several different systemd tools define a nulstr containing a standard
series of configuration file directories, in /etc, /run, /usr/local/lib,
/usr/lib, and (#ifdef HAVE_SPLIT_USR) /lib. Factor that logic out into
a new helper macro, CONF_DIRS_NULSTR.
Diffstat (limited to 'src/sysusers')
| -rw-r--r-- | src/sysusers/sysusers.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c index 04e973ac17..7820e84983 100644 --- a/src/sysusers/sysusers.c +++ b/src/sysusers/sysusers.c @@ -67,15 +67,7 @@ typedef struct Item { static char *arg_root = NULL; -static const char conf_file_dirs[] = - "/etc/sysusers.d\0" - "/run/sysusers.d\0" - "/usr/local/lib/sysusers.d\0" - "/usr/lib/sysusers.d\0" -#ifdef HAVE_SPLIT_USR - "/lib/sysusers.d\0" -#endif - ; +static const char conf_file_dirs[] = CONF_DIRS_NULSTR("sysusers"); static Hashmap *users = NULL, *groups = NULL; static Hashmap *todo_uids = NULL, *todo_gids = NULL; |