Some minor bugs for dntest ""

[openldap] / include / ldap_defaults.h

diff --git a/include/ldap_defaults.h b/include/ldap_defaults.h
index 0d0919ff8c44515fb83f561ba78cd5866eda84fd..9f25a6e8f9a1cc28fa038f2e98c3091d9ae6b031 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.
@@ -35,6 +36,8 @@
 #define LDAP_USERRC_FILE "ldaprc"
 #define LDAP_ENV_PREFIX "LDAP"
 
+/* default ldapi:// socket */
+#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "ldapi"
 
 /*
  * SHARED DEFINITIONS - other things you can change
@@ -47,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
@@ -76,12 +78,14 @@ Please try again later.\r\n"
 #define FINGER_DEREF           LDAP_DEREF_FINDING
        /* attribute to use when sorting results */
 #define FINGER_SORT_ATTR       SORT_ATTR
+#ifdef LDAP_UFN
        /* enable ufn support */
 #define FINGER_UFN
+#endif
        /* timeout for searches */
 #define FINGER_TIMEOUT         60
        /* number of DN components to show in entry displays */
-#define FINGER_RDNCOUNT                DEFAULT_RDNCOUNT        
+#define FINGER_RDNCOUNT                DEFAULT_RDNCOUNT
 
 /*
  * GO500 GOPHER GATEWAY DEFINITIONS
@@ -94,15 +98,17 @@ Please try again later.\r\n"
 #define GO500_SORT_ATTR        SORT_ATTR
        /* timeout for searches */
 #define GO500_TIMEOUT  180
+#ifdef LDAP_UFN
        /* enable ufn support */
 #define GO500_UFN
+#endif
        /*
         * only set and uncomment this if your hostname() does not return
         * a fully qualified hostname
         */
 /* #define GO500_HOSTNAME      "fully.qualified.hostname.here" */
        /* number of DN components to show in entry displays */
-#define GO500_RDNCOUNT         DEFAULT_RDNCOUNT        
+#define GO500_RDNCOUNT         DEFAULT_RDNCOUNT
 
 /*
  * GO500GW GOPHER GATEWAY DEFINITIONS
@@ -113,8 +119,10 @@ Please try again later.\r\n"
 #define GO500GW_PORT           7777
        /* timeout on all searches */
 #define GO500GW_TIMEOUT                180
+#ifdef LDAP_UFN
        /* enable ufn support */
 #define GO500GW_UFN
+#endif
        /* attribute to use when sorting results */
 #define GO500GW_SORT_ATTR      SORT_ATTR
        /*
@@ -123,7 +131,7 @@ Please try again later.\r\n"
         */
 /* #define GO500GW_HOSTNAME    "fully.qualified.hostname.here" */
        /* number of DN components to show in entry displays */
-#define GO500GW_RDNCOUNT       DEFAULT_RDNCOUNT        
+#define GO500GW_RDNCOUNT       DEFAULT_RDNCOUNT
 
 /*
  * RCPT500 MAIL RESPONDER GATEWAY DEFINITIONS
@@ -141,10 +149,12 @@ Please try again later.\r\n"
 #define RCPT500_SORT_ATTR      SORT_ATTR
        /* max number of hits displayed in full before a list is presented */
 #define RCPT500_LISTLIMIT      1
+#ifdef LDAP_UFN
        /* enable ufn support */
 #define RCPT500_UFN
+#endif
        /* number of DN components to show in entry displays */
-#define RCPT500_RDNCOUNT       DEFAULT_RDNCOUNT        
+#define RCPT500_RDNCOUNT       DEFAULT_RDNCOUNT
 
 /*
  * MAIL500 MAILER DEFINITIONS
@@ -195,8 +205,9 @@ Please try again later.\r\n"
  */
        /* location of the default slapd config file */
 #define SLAPD_DEFAULT_CONFIGFILE       LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.conf"
+#define SLAPD_DEFAULT_UCDATA           LDAP_DATADIR LDAP_DIRSEP "ucdata"
        /* default max deref depth for aliases */
-#define SLAPD_DEFAULT_MAXDEREFDEPTH    15      
+#define SLAPD_DEFAULT_MAXDEREFDEPTH    15
        /* default sizelimit on number of entries from a search */
 #define SLAPD_DEFAULT_SIZELIMIT                500
        /* default timelimit to spend on a search */
@@ -207,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