added hasSubordinates to back-monitor

[openldap] / include / ldap_defaults.h

diff --git a/include/ldap_defaults.h b/include/ldap_defaults.h
index a410df839f6e9c3484dccef0b6d4fab122d2ccee..c8cbcf2ef29412ef1fd6b75a4f3942e47d540fea 100644 (file)
--- a/include/ldap_defaults.h
+++ b/include/ldap_defaults.h
@@ -37,10 +37,7 @@
 #define LDAP_ENV_PREFIX "LDAP"
 
 /* default ldapi:// socket */
-#define LDAPI_SOCK LDAP_TMPDIR LDAP_DIRSEP ".ldapi_sock"
-
-/* default file: URI prefix */
-#define LDAP_FILE_URI_PREFIX "file://" LDAP_TMPDIR LDAP_DIRSEP
+#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "ldapi"
 
 /*
  * SHARED DEFINITIONS - other things you can change
@@ -53,7 +50,6 @@
 #define FILTERFILE     LDAP_SYSCONFDIR LDAP_DIRSEP "ldapfilter.conf"
 #define TEMPLATEFILE   LDAP_SYSCONFDIR LDAP_DIRSEP "ldaptemplates.conf"
 #define SEARCHFILE     LDAP_SYSCONFDIR LDAP_DIRSEP "ldapsearchprefs.conf"
-#define FRIENDLYFILE   LDAP_DATADIR LDAP_DIRSEP "ldapfriendly"
 
 /*
  * FINGER DEFINITIONS
@@ -222,9 +218,9 @@ Please try again later.\r\n"
 /* the following DNs must be normalized! */
        /* dn of the default subschema subentry */
 #define SLAPD_SCHEMA_DN                        "cn=Subschema"
-#if 0
        /* dn of the default "monitor" subentry */
 #define SLAPD_MONITOR_DN               "cn=Monitor"
+#if 0
        /* dn of the default "config" subentry */
 #define SLAPD_CONFIG_DN                        "cn=Config"
 #endif