From: Frank Lahm <franklahm@googlemail.com>
Date: Wed, 14 Mar 2012 14:02:08 +0000 (+0100)
Subject: New state dir
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=0c1ba66ff94ef48f89963947407d4a3defb8da79

New state dir
---

diff --git a/config/Makefile.am b/config/Makefile.am
index 2d0a8580..272087aa 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -29,6 +29,8 @@ pkgconfdir = @PKGCONFDIR@
 #
 
 install-data-local: install-config-files
+	mkdir -pm 0755 $(DESTDIR)$(localstatedir)/netatalk/
+	$(INSTALL_DATA) README $(DESTDIR)$(localstatedir)/netatalk/
 
 uninstall-local:
 	for f in $(CONFFILES) $(GENFILES); do \
diff --git a/config/README b/config/README
new file mode 100644
index 00000000..f0f9ab7a
--- /dev/null
+++ b/config/README
@@ -0,0 +1 @@
+This directory contains modifiable Netatalk configuration files and the CNID databases.
\ No newline at end of file
diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index dbbdd0ae..f499fe72 100644
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -58,7 +58,8 @@ afpd_CFLAGS = \
 	-DSERVERTEXT=\"$(SERVERTEXT)/\" \
 	-D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\" \
 	-D_PATH_AFPDUAMPATH=\"$(UAMS_PATH)/\" \
-	-D_PATH_CONFDIR=\"$(pkgconfdir)/\"
+	-D_PATH_CONFDIR=\"$(pkgconfdir)/\" \
+	-D_PATH_STATEDIR='"$(localstatedir)/netatalk/"'
 
 if HAVE_ACLS
 afpd_SOURCES += acls.c
diff --git a/etc/afpd/afp_options.c b/etc/afpd/afp_options.c
index 6b1f2462..09e04c02 100644
--- a/etc/afpd/afp_options.c
+++ b/etc/afpd/afp_options.c
@@ -222,6 +222,7 @@ static void show_version_extended(void )
 static void show_paths( void )
 {
 	printf( "              afp.conf:\t%s\n", _PATH_CONFDIR "afp.conf");
+	printf( "       state directory:\t%s\n", _PATH_STATEDIR);
 	printf( "    afp_signature.conf:\t%s\n", _PATH_CONFDIR "afp_signature.conf");
 	printf( "      afp_voluuid.conf:\t%s\n", _PATH_CONFDIR "afp_voluuid.conf");
 	printf( "       UAM search path:\t%s\n", _PATH_AFPDUAMPATH );
diff --git a/include/atalk/paths.h b/include/atalk/paths.h
index 793d4fc9..c93451b7 100644
--- a/include/atalk/paths.h
+++ b/include/atalk/paths.h
@@ -53,3 +53,4 @@
 #endif
 
 #endif /* atalk/paths.h */
+
diff --git a/libatalk/util/Makefile.am b/libatalk/util/Makefile.am
index 14670292..65ad1d6c 100644
--- a/libatalk/util/Makefile.am
+++ b/libatalk/util/Makefile.am
@@ -22,10 +22,11 @@ libutil_la_SOURCES = \
 	unix.c
 
 libutil_la_CFLAGS = \
-	-D_PATH_CONFDIR=\"$(pkgconfdir)/\" \
-	-DSERVERTEXT=\"$(SERVERTEXT)/\" \
-	-D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\" \
-	-D_PATH_AFPDUAMPATH=\"$(UAMS_PATH)/\"
+	-D_PATH_CONFDIR='"$(pkgconfdir)/"' \
+	-DSERVERTEXT='"$(SERVERTEXT)/"' \
+	-D_PATH_AFPDPWFILE='"$(pkgconfdir)/afppasswd"' \
+	-D_PATH_AFPDUAMPATH='"$(UAMS_PATH)/"' \
+	-D_PATH_STATEDIR='"$(localstatedir)/netatalk/"'
 
 if HAVE_ATFUNCS
 libutil_la_SOURCES += ftw.c
diff --git a/libatalk/util/netatalk_conf.c b/libatalk/util/netatalk_conf.c
index 99520e05..cf98a00c 100644
--- a/libatalk/util/netatalk_conf.c
+++ b/libatalk/util/netatalk_conf.c
@@ -1360,8 +1360,8 @@ int afp_config_parse(AFPObj *AFPObj)
 
     AFPObj->afp_version = 11;
     options->configfile  = AFPObj->cmdlineconfigfile ? strdup(AFPObj->cmdlineconfigfile) : strdup(_PATH_CONFDIR "afp.conf");
-    options->sigconffile = strdup(_PATH_CONFDIR "afp_signature.conf");
-    options->uuidconf    = strdup(_PATH_CONFDIR "afp_voluuid.conf");
+    options->sigconffile = strdup(_PATH_STATEDIR "afp_signature.conf");
+    options->uuidconf    = strdup(_PATH_STATEDIR "afp_voluuid.conf");
     options->flags       = OPTION_ACL2MACCESS | OPTION_UUID | OPTION_SERVERNOTIF | AFPObj->cmdlineflags;
     
     if ((config = iniparser_load(AFPObj->options.configfile)) == NULL)