From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 10 Aug 2000 02:52:01 +0000 (+0000)
Subject: Move default slurpd directory to $(LOCALSTATEDIR)/openldap-slurp.
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~2286
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=27ebe8534ae213895cd222dca47564f1d82e22cd;p=openldap

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

diff --git a/doc/man/man8/slurpd.8 b/doc/man/man8/slurpd.8
index 2b8fea8b5d..e8b80c58dd 100644
--- 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 6a1137eb16..613ba59da7 100644
--- 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 4983641a60..f1f54b35c0 100644
--- 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"