SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce CONF_DIRS_NULSTR helper to define standard conf dirs

Browse Source 
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.
This commit is contained in:
Josh Triplett
2014-11-26 19:11:37 -05:00
committed by Zbigniew Jędrzejewski-Szmek
parent 3d82301321
commit 7f0a55d432
6 changed files with 20 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sysusers/sysusers.c
+1 -9
View File
@@ -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;