X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fldap_features.h.in;h=fc3e3fc36141a82f1c1442fbbe237be9df1056b4;hb=4fcab959c02ef360373e055f8a739f16286e8112;hp=a8a742735f6d77d45ccc7e5912cdb1adfca645f9;hpb=6437785a82b31cd58bf3bc685f81b4db9d92dd91;p=openldap

diff --git a/include/ldap_features.h.in b/include/ldap_features.h.in
index a8a742735f..fc3e3fc361 100644
--- a/include/ldap_features.h.in
+++ b/include/ldap_features.h.in
@@ -1,32 +1,42 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * 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 in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
+
 /* 
  * LDAP Features
  */
+
 #ifndef _LDAP_FEATURES_H
 #define _LDAP_FEATURES_H 1
 
+/* OpenLDAP API version macros */
+#undef LDAP_VENDOR_VERSION
+#undef LDAP_VENDOR_VERSION_MAJOR
+#undef LDAP_VENDOR_VERSION_MINOR
+#undef LDAP_VENDOR_VERSION_PATCH
+
 /*
+** WORK IN PROGRESS!
+**
 ** OpenLDAP reentrancy/thread-safeness should be dynamically
 ** checked using ldap_get_option().
 **
-** The -lldap implementation may or may not be:
-**		LDAP_API_FEATURE_THREAD_SAFE
-**
-** The preprocessor flag LDAP_API_FEATURE_X_OPENLDAP_REENTRANT can
-** be used to determine if -lldap is LDAP_API_FEATURE_THREAD_SAFE at
-** compile time.
+** The -lldap implementation is not thread-safe.
 **
-** The -lldap_r implementation is always THREAD_SAFE but
-** may also be:
+** The -lldap_r implementation is:
+**		LDAP_API_FEATURE_THREAD_SAFE (basic thread safety)
+** but also be:
 **		LDAP_API_FEATURE_SESSION_THREAD_SAFE
 **		LDAP_API_FEATURE_OPERATION_THREAD_SAFE
 **
@@ -41,15 +51,9 @@
 **
 */
 
-/* is -lldap reentrant or not */
-#undef LDAP_API_FEATURE_X_OPENLDAP_REENTRANT
-
-/* is threadsafe version of -lldap (ie: -lldap_r) *available* or not */
+/* is -lldap_r available or not */
 #undef LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE
 
-/* LDAP v2 DNS */
-#undef LDAP_API_FEATURE_X_OPENLDAP_V2_DNS
-
 /* LDAP v2 Kerberos Bind */
 #undef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND