From 824620a77cd9ab856002835c0d305dadd37c83c2 Mon Sep 17 00:00:00 2001
From: Michael Bouchaud <yoz@efl.so>
Date: Mon, 5 May 2014 19:10:32 +0000
Subject: [PATCH] entrance: move entrance config to /entrance/entrance.conf

---
 data/Makefile.am             | 6 +++---
 src/daemon/entrance_config.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/data/Makefile.am b/data/Makefile.am
index a0d0d0b..d5bd523 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -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
diff --git a/src/daemon/entrance_config.c b/src/daemon/entrance_config.c
index 365e78f..b095af9 100644
--- a/src/daemon/entrance_config.c
+++ b/src/daemon/entrance_config.c
@@ -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();