Move default slurpd directory to $(LOCALSTATEDIR)/openldap-slurp.

diff --git a/doc/man/man8/slurpd.8 b/doc/man/man8/slurpd.8
index 2b8fea8b5d6e867526d7e4af2f59bfe8ce6ebc79..e8b80c58ddf16c972c1381e577d104f1acb61b6b 100644 (file)
--- a/doc/man/man8/slurpd.8
+++ b/doc/man/man8/slurpd.8
@@ -109,7 +109,7 @@ processes a replication log and exits.
 copies the replication log to a working directory before processing it.
 This option allows you to specify the location of these temporary files. 
 The default is
-.BR /usr/tmp .
+.BR LOCALSTATEDIR/openldap-slurp .
 .TP
 .BI \-k " srvtab\-file"
 Specify the location of the kerberos srvtab file which contains keys

diff --git a/servers/slurpd/Makefile.in b/servers/slurpd/Makefile.in
index 6a1137eb161685499d4f128b2d58cc80b47a2a5b..613ba59da716d51e4f5e32960fbeaff0a094e192 100644 (file)
--- a/servers/slurpd/Makefile.in
+++ b/servers/slurpd/Makefile.in
@@ -45,6 +45,7 @@ version.c: $(OBJS) $(LDAP_LIBDEPEND) $(LDAP_LIBTHREAD_DEPEND)
 
 install-local-srv: FORCE
        -$(MKDIR) $(DESTDIR)$(libexecdir)
+       -$(MKDIR) $(DESTDIR)$(localstatedir)/openldap-slurp
        @(                                                              \
            for prg in $(PROGRAMS); do                                  \
                $(LTINSTALL) $(INSTALLFLAGS) -s -m 755 $$prg$(EXEEXT)   \

diff --git a/servers/slurpd/slurp.h b/servers/slurpd/slurp.h
index 4983641a60547ee2a8ba6357b207737e70bff49c..f1f54b35c04623e67f1cc19f2f1dc3fcfa8eaace 100644 (file)
--- a/servers/slurpd/slurp.h
+++ b/servers/slurpd/slurp.h
@@ -40,7 +40,7 @@
 
 
 /* Default directory for slurpd's private copy of replication logs */
-#define        DEFAULT_SLURPD_REPLICA_DIR      "/usr/tmp"
+#define        DEFAULT_SLURPD_REPLICA_DIR      LDAP_RUNDIR LDAP_DIRSEP "openldap-slurp"
 
 /* Default name for slurpd's private copy of the replication log */
 #define        DEFAULT_SLURPD_REPLOGFILE       "slurpd.replog"
@@ -49,7 +49,7 @@
 #define        DEFAULT_SLURPD_STATUS_FILE      "slurpd.status"
 
 /* slurpd dump file - contents of rq struct are written here (debugging) */
-#define        SLURPD_DUMPFILE                 "/tmp/slurpd.dump"
+#define        SLURPD_DUMPFILE                 LDAP_TMPDIR LDAP_DIRSEP "slurpd.dump"
 
 /* default srvtab file.  Can be overridden */
 #define        SRVTAB                          "/etc/srvtab"