New state dir

diff --git a/config/Makefile.am b/config/Makefile.am
index 2d0a858070b13a2406b4410dd4458fdf80b58efb..272087aa502cccfc54b69024a3640fd14a416243 100644 (file)
--- 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 (file)
index 0000000..f0f9ab7
--- /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 dbbdd0ae43addef67c5840111b8f2fab4a92284f..f499fe72b0aa11d8f8e90479dfb64c9386fee091 100644 (file)
--- 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 6b1f24626f6520a3e3f69ac3b9cd2676a88fda6d..09e04c022ae4e77f9af95faf390965bf9e982649 100644 (file)
--- 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 793d4fc98e052421896543eb6f5d0175f75e61da..c93451b7ec38ebe7f78352971997e867d18c9e07 100644 (file)
--- 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 146702926215c29138451495079bfa668f5e8707..65ad1d6ca9704b8e535a1aa6e71d2d1b5847e7fd 100644 (file)
--- 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 99520e05350231050fa7ba593d0460dcb4d1ea25..cf98a00c3da2fcdb1669d0b84da27b9850a07af7 100644 (file)
--- 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)