Move pid/args files into $(RUNDIR)/run

Move ldapi into $(RUNDIR)/run/openldap

diff --git a/include/ldap_defaults.h b/include/ldap_defaults.h
index 922e0d030d64f32d958da5a7e8b24144f81d6f95..91b73336bed9a6551f2db3be6068cdc9bfd6d271 100644 (file)
--- a/include/ldap_defaults.h
+++ b/include/ldap_defaults.h
@@ -39,7 +39,8 @@
 #define LDAP_ENV_PREFIX "LDAP"
 
 /* default ldapi:// socket */
-#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "ldapi"
+#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" \
+       LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"
 
 /*
  * SLAPD DEFINITIONS

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 7dfe72d35ec9214406d6c8e0b672d5e5c20dda0b..26988f2c73978d9411286e0d265494528ab4d4f9 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -343,7 +343,7 @@ install-local-srv: install-slapd install-conf install-schema install-tools
 
 install-slapd: FORCE
        -$(MKDIR) $(DESTDIR)$(libexecdir)
-       -$(MKDIR) $(DESTDIR)$(localstatedir)
+       -$(MKDIR) $(DESTDIR)$(localstatedir)/run/openldap
        $(LTINSTALL) $(INSTALLFLAGS) -s -m 755 \
                slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
        @for i in $(SUBDIRS); do \

diff --git a/servers/slapd/slapd.conf b/servers/slapd/slapd.conf
index 6ea1eab79d976e5c4b89bba317fda09a9c25678c..f7f251113d7088dfc1fc4fe79a01bf792e0fec25 100644 (file)
--- a/servers/slapd/slapd.conf
+++ b/servers/slapd/slapd.conf
@@ -10,8 +10,8 @@ include               %SYSCONFDIR%/schema/core.schema
 # service AND an understanding of referrals.
 #referral      ldap://root.openldap.org
 
-pidfile                %LOCALSTATEDIR%/slapd.pid
-argsfile       %LOCALSTATEDIR%/slapd.args
+pidfile                %LOCALSTATEDIR%/run/slapd.pid
+argsfile       %LOCALSTATEDIR%/run/slapd.args
 
 # Load dynamic backend modules:
 # modulepath   %MODULEDIR%