Move ldapi to /var/run

diff --git a/include/ldap_defaults.h b/include/ldap_defaults.h
index 91b73336bed9a6551f2db3be6068cdc9bfd6d271..510e37b7f1338b640b7b1be84d10440b56482d82 100644 (file)
--- 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 26988f2c73978d9411286e0d265494528ab4d4f9..1934b6e86d4df104fb427674bdd6c2e4db63beb3 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)/run/openldap
+       -$(MKDIR) $(DESTDIR)$(localstatedir)/run
        $(LTINSTALL) $(INSTALLFLAGS) -s -m 755 \
                slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
        @for i in $(SUBDIRS); do \