non-root add/delete of entries rooted at '' checks children write permission (forward...

[openldap] / include / ldap_defaults.h

diff --git a/include/ldap_defaults.h b/include/ldap_defaults.h
index b7d73212510de73e6cfd955d4656d8e3f2e46d33..c5d42f2ae828f0dd1cbbb4b086bfec4b6fdde926 100644 (file)
--- a/include/ldap_defaults.h
+++ b/include/ldap_defaults.h
@@ -1,12 +1,13 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2001 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License.  A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.  A copy of this license is available at
+ * http://www.OpenLDAP.org/license.html or in file LICENSE in the
+ * top-level directory of the distribution.
  */
 /* Portions
  * Copyright (c) 1994 Regents of the University of Michigan.
@@ -36,7 +37,7 @@
 #define LDAP_ENV_PREFIX "LDAP"
 
 /* default ldapi:// socket */
-#define LDAPI_SOCK LDAP_TMPDIR LDAP_DIRSEP ".ldapi_sock"
+#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "ldapi"
 
 /* default file: URI prefix */
 #define LDAP_FILE_URI_PREFIX "file://" LDAP_TMPDIR LDAP_DIRSEP
@@ -221,9 +222,10 @@ 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"
+#define SLAPD_MONITOR_NDN              "CN=MONITOR"
+#if 0
        /* dn of the default "config" subentry */
 #define SLAPD_CONFIG_DN                        "cn=Config"
 #endif