From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 19 Dec 2003 02:28:06 +0000 (+0000)
Subject: Move ldapi to /var/run
X-Git-Tag: OPENLDAP_REL_ENG_2_1_MP~134
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5481755c0e1bbff64243d511b4c335fb690f6991;p=openldap

Move ldapi to /var/run
---

diff --git a/include/ldap_defaults.h b/include/ldap_defaults.h
index 91b73336be..510e37b7f1 100644
--- a/include/ldap_defaults.h
+++ b/include/ldap_defaults.h
@@ -39,8 +39,7 @@
 #define LDAP_ENV_PREFIX "LDAP"
 
 /* default ldapi:// socket */
-#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" \
-	LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"
+#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"
 
 /*
  * SLAPD DEFINITIONS
diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 26988f2c73..1934b6e86d 100644
--- 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)/run/openldap
+	-$(MKDIR) $(DESTDIR)$(localstatedir)/run
 	$(LTINSTALL) $(INSTALLFLAGS) -s -m 755 \
 		slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
 	@for i in $(SUBDIRS); do \