Update copyright (including with or without modification clarification)

[openldap] / include / ldap_defaults.h

diff --git a/include/ldap_defaults.h b/include/ldap_defaults.h
index c02734465da177d3effdb6001a7018f6e50718ff..a410df839f6e9c3484dccef0b6d4fab122d2ccee 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.
@@ -81,8 +82,10 @@ 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 */
@@ -99,8 +102,10 @@ 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
@@ -118,8 +123,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
        /*
@@ -146,8 +153,10 @@ 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        
 
@@ -200,6 +209,7 @@ 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      
        /* default sizelimit on number of entries from a search */