Fix UTF8StringNormalize overrun on zero-length string

[openldap] / include / ldap_defaults.h

diff --git a/include/ldap_defaults.h b/include/ldap_defaults.h
index 87f497c4a027beeb7aaed31c3d980a81316b1acf..426d7f6d10fbf25fb0adc235fa5f810b1f339411 100644 (file)
--- a/include/ldap_defaults.h
+++ b/include/ldap_defaults.h
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  * 
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2011 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,41 +39,14 @@
 #define LDAP_ENV_PREFIX "LDAP"
 
 /* default ldapi:// socket */
-#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "ldapi"
-
-/*
- * MAIL500 MAILER DEFINITIONS
- */
-       /* max number of ambiguous matches reported */
-#define MAIL500_MAXAMBIGUOUS   10
-       /* max subscribers allowed (size limit when searching for them ) */
-#define MAIL500_MAXGROUPMEMBERS        LDAP_NO_LIMIT
-       /* timeout for all searches */
-#define MAIL500_TIMEOUT                180
-       /* sendmail location - mail500 needs to exec this */
-#define MAIL500_SENDMAIL       LDAP_SENDMAIL
-
-/*
- * UD DEFINITIONS
- */
-       /* default config file locations */
-#define FILTERFILE     LDAP_SYSCONFDIR LDAP_DIRSEP "ldapfilter.conf"
-       /* ud configuration file */
-#define UD_CONFIG_FILE         LDAP_SYSCONFDIR LDAP_DIRSEP "ud.conf"
-       /* default editor */
-#define UD_DEFAULT_EDITOR      LDAP_EDITOR
-       /* default bbasename of user config file */
-#define UD_USER_CONFIG_FILE    ".udrc"
-       /* default base where groups are created */
-#define UD_WHERE_GROUPS_ARE_CREATED    ""
-       /* default base below which all groups live */
-#define UD_WHERE_ALL_GROUPS_LIVE       ""
+#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"
 
 /*
  * SLAPD DEFINITIONS
  */
        /* location of the default slapd config file */
 #define SLAPD_DEFAULT_CONFIGFILE       LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.conf"
+#define SLAPD_DEFAULT_CONFIGDIR                LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.d"
 #define SLAPD_DEFAULT_DB_DIR           LDAP_RUNDIR LDAP_DIRSEP "openldap-data"
 #define SLAPD_DEFAULT_DB_MODE          0600
 #define SLAPD_DEFAULT_UCDATA           LDAP_DATADIR LDAP_DIRSEP "ucdata"
@@ -83,8 +56,6 @@
 #define SLAPD_DEFAULT_SIZELIMIT                500
        /* default timelimit to spend on a search */
 #define SLAPD_DEFAULT_TIMELIMIT                3600
-       /* minimum max ids that a single index entry can map to in ldbm */
-#define SLAPD_LDBM_MIN_MAXIDS          (8192-4)
 
 /* the following DNs must be normalized! */
        /* dn of the default subschema subentry */