old
/
entrance
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

entrance: move entrance config to /entrance/entrance.conf

This commit is contained in:
Michael Bouchaud 2014-05-05 19:10:32 +00:00
parent 3cca28d7d1
commit 824620a77c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/Makefile.am
View File

@ -1,15 +1,15 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = entrance entrance.conf entrance.other entrance.service.in EXTRA_DIST = entrance entrance.conf entrance.other entrance.service.in Xsession
SUBDIRS = themes SUBDIRS = themes
pamdir = $(sysconfdir)/pam.d/ pamdir = $(sysconfdir)/pam.d/
pam_DATA = entrance pam_DATA = entrance
confdir = $(sysconfdir) confdir = $(sysconfdir)/entrance
conf_DATA = entrance.conf conf_DATA = entrance.conf Xsession
sudoersdir = $(sysconfdir)/sudoers.d sudoersdir = $(sysconfdir)/sudoers.d
sudoers_DATA = sudoers/entrance sudoers_DATA = sudoers/entrance

6
src/daemon/entrance_config.c
View File

@ -50,11 +50,11 @@ _users_get(void)
if (!ef) if (!ef)
ef = eet_open("/var/cache/"PACKAGE"/"ENTRANCE_CONFIG_FILE, ef = eet_open("/var/cache/"PACKAGE"/"ENTRANCE_CONFIG_FILE,
EET_FILE_MODE_WRITE); EET_FILE_MODE_WRITE);
f = fopen(SYSTEM_CONFIG_DIR"/entrance.conf", "rb"); f = fopen(SYSTEM_CONFIG_DIR"/entrance/entrance.conf", "rb");
if (!f) if (!f)
{ {
fprintf(stderr, fprintf(stderr,
PACKAGE": Could not open "SYSTEM_CONFIG_DIR"/entrance.conf\n"); PACKAGE": Could not open "SYSTEM_CONFIG_DIR"/entrance/entrance.conf\n");
return; return;
} }
@ -176,7 +176,7 @@ entrance_config_init()
} }
else else
{ {
stat(SYSTEM_CONFIG_DIR"/entrance.conf", &conf); stat(SYSTEM_CONFIG_DIR"/entrance/entrance.conf", &conf);
if (cache.st_mtime < conf.st_mtime) if (cache.st_mtime < conf.st_mtime)
{ {
_users_get(); _users_get();