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

devs/bu5hm4n/develop
Michael Bouchaud 10 years ago
parent 3cca28d7d1
commit 824620a77c
  1. 6
      data/Makefile.am
  2. 6
      src/daemon/entrance_config.c

@ -1,15 +1,15 @@
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
pamdir = $(sysconfdir)/pam.d/
pam_DATA = entrance
confdir = $(sysconfdir)
conf_DATA = entrance.conf
confdir = $(sysconfdir)/entrance
conf_DATA = entrance.conf Xsession
sudoersdir = $(sysconfdir)/sudoers.d
sudoers_DATA = sudoers/entrance

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

Loading…
Cancel
Save