For ITS#157: Added LDAP backend for slapd, which also required adding

[openldap] / include / ldap.h

diff --git a/include/ldap.h b/include/ldap.h
index cbda15c325a738906e4b69191d37aef1dcd091de..508413628becbc89ad52623c12cfc8c8aa6e1941 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -106,6 +106,7 @@ LDAP_BEGIN_DECL
 #define LDAP_OPT_DEBUG_LEVEL           0x5001  /* debug level */
 #define LDAP_OPT_TIMEOUT                       0x5002  /* default timeout */
 #define LDAP_OPT_REFHOPLIMIT           0x5003  /* ref hop limit */
+#define LDAP_OPT_MATCH_STRING          0x5004  /* should have been in draft */
 
 /* on/off values */
 #define LDAP_OPT_ON            ((void *) 1)
@@ -135,7 +136,7 @@ typedef struct ldapcontrol {
        char *                  ldctl_oid;
        struct berval   ldctl_value;
        char                    ldctl_iscritical;
-} LDAPControl, *PLDAPControl;
+} LDAPControl;
 
 /* LDAP "Standard" Controls */
 #define LDAP_CONTROL_REFERRALS "1.2.840.113666.1.4.616"
@@ -709,7 +710,7 @@ ldap_kerberos_bind2_s LDAP_P((
 
 /*
  * in cache.c
- * DEPRECATED
+ * (deprecated)
  */
 LDAP_F( int )
 ldap_enable_cache LDAP_P(( LDAP *ld, long timeout, long maxmem ));
@@ -852,7 +853,7 @@ ldap_modify_s LDAP_P((
 
 
 /*
- * in rename.c:
+ * in modrdn.c:
  */
 LDAP_F( int )
 ldap_rename_ext LDAP_P((
@@ -875,10 +876,22 @@ ldap_rename_ext_s LDAP_P((
        LDAPControl             **serverctrls,
        LDAPControl             **clientctrls ));
 
+LDAP_F( int )
+ldap_rename2 LDAP_P((
+       LDAP *ld,
+       LDAP_CONST char *dn,
+       LDAP_CONST char *newrdn,
+       int deleteoldrdn,
+       LDAP_CONST char *newSuperior ));
+
+LDAP_F( int )
+ldap_rename2_s LDAP_P((
+       LDAP *ld,
+       LDAP_CONST char *dn,
+       LDAP_CONST char *newrdn,
+       int deleteoldrdn,
+       LDAP_CONST char *newSuperior));
 
-/*
- * in modrdn.c:
- */
 LDAP_F( int )
 ldap_modrdn LDAP_P((
        LDAP *ld,
@@ -905,21 +918,6 @@ ldap_modrdn2_s LDAP_P((
        LDAP_CONST char *newrdn,
        int deleteoldrdn));
 
-LDAP_F( int )
-ldap_rename2 LDAP_P((
-       LDAP *ld,
-       LDAP_CONST char *dn,
-       LDAP_CONST char *newrdn,
-       int deleteoldrdn,
-       LDAP_CONST char *newSuperior ));
-
-LDAP_F( int )
-ldap_rename2_s LDAP_P((
-       LDAP *ld,
-       LDAP_CONST char *dn,
-       LDAP_CONST char *newrdn,
-       int deleteoldrdn,
-       LDAP_CONST char *newSuperior));
 
 /*
  * in open.c:
@@ -1327,6 +1325,7 @@ ldap_build_filter LDAP_P((
 /*
  * in free.c
  */
+
 LDAP_F( void )
 ldap_memfree LDAP_P((
        void *p ));