Update configure to:

[openldap] / include / ldap.h

diff --git a/include/ldap.h b/include/ldap.h
index d50667609fbb0ead7081ae0990e2d41fe4ddf8e3..cbd7575574e3ab08d8c1e4fe58c11138394f1e09 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -1,4 +1,13 @@
 /*
+ * Copyright 1998,1999 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.
+ */
+/* Portions
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
  *
@@ -35,6 +44,9 @@ LDAP_BEGIN_DECL
 /* We'll eventually release as 200 */
 #define LDAP_VENDOR_VERSION    190
 
+/* OpenLDAP API Features */
+#define LDAP_API_FEATURE_X_OPENLDAP 1
+
 /* include LDAP_API_FEATURE defines */
 #include <ldap_features.h>
 
@@ -64,8 +76,6 @@ typedef struct ldap_apifeature_info {
 #define LDAP_NO_ATTRS                          "1.1"
 #define LDAP_ALL_USER_ATTRIBUTES       "*"
 
-#define LDAP_SASL_SIMPLE                       NULL
-
 #define LDAP_COMPAT20
 #define LDAP_COMPAT30
 #if defined(LDAP_COMPAT20) || defined(LDAP_COMPAT30)
@@ -135,6 +145,23 @@ typedef struct ldapcontrol {
 #define LDAP_TAG_MSGID         0x02L
 /* need to add other LDAP_TAGs here */
 
+/* Overview of tag construction in ASN.1:
+ *      _______
+ * Bit # | 8 7 | CLASS: UNIVERSAL              00
+ *                     APPLICATION             01
+ *                     CONTEXT-SPECIFIC        10
+ *                     PRIVATE                 11
+ *             _____
+ *             | 6 | DATA-TYPE: PRIMITIVE      0
+ *                              CONSTRUCTED    1
+ *                 ___________
+ *                 | 5 ... 1 | TAG-NUMBER
+ */
+ 
+#define LDAP_TAG_NEWSUPERIOR   0x80L   /* context-specific + primitive +
+                                        * tag # ==> [0]
+                                        */
+
 /* possible operations a client can invoke */
 #define LDAP_REQ_BIND                  0x60L   /* application + constructed */
 #define LDAP_REQ_UNBIND                        0x42L   /* application + primitive   */
@@ -194,6 +221,9 @@ typedef struct ldapcontrol {
 #define OLD_LDAP_RES_MODDN             OLD_LDAP_RES_MODRDN
 #define OLD_LDAP_RES_COMPARE           0x0fL
 
+/* sasl methods */
+#define LDAP_SASL_SIMPLE                       NULL
+
 /* authentication methods available */
 #define LDAP_AUTH_NONE         0x00L   /* no authentication              */
 #define LDAP_AUTH_SIMPLE       0x80L   /* context specific + primitive   */
@@ -430,13 +460,6 @@ typedef struct ldap_friendly {
        char    *lf_friendly;
 } LDAPFriendlyMap;
 
-
-/*
- * handy macro to check whether LDAP struct is set up for CLDAP or not
- */
-#define LDAP_IS_CLDAP( ld )    ( (ld)->ld_sb.sb_naddr > 0 )
-
-
 /*
  * types for ldap URL handling
  */
@@ -471,6 +494,7 @@ LDAP_F int ldap_set_option LDAP_P((LDAP *ld, int option, void *invalue));
  */
 LDAP_F void ldap_control_free LDAP_P(( LDAPControl *ctrl ));
 LDAP_F void ldap_controls_free LDAP_P(( LDAPControl **ctrls ));
+
   
 /*
  * in extended.c:
@@ -699,7 +723,10 @@ LDAP_F int ldap_modrdn2 LDAP_P(( LDAP *ld, char *dn, char *newrdn,
        int deleteoldrdn ));
 LDAP_F int ldap_modrdn2_s LDAP_P(( LDAP *ld, char *dn, char *newrdn,
        int deleteoldrdn));
-
+LDAP_F int ldap_rename2 LDAP_P(( LDAP *ld, char *dn, char *newrdn,
+       int deleteoldrdn, char *newSuperior ));
+LDAP_F int ldap_rename2_s LDAP_P(( LDAP *ld, char *dn, char *newrdn,
+       int deleteoldrdn, char *newSuperior));
 
 /*
  * in open.c:
@@ -721,7 +748,13 @@ LDAP_F int ldap_count_messages LDAP_P(( LDAP *ld, LDAPMessage *chain ));
  */
 LDAP_F LDAPMessage *ldap_first_reference LDAP_P(( LDAP *ld, LDAPMessage *chain ));
 LDAP_F LDAPMessage *ldap_next_reference LDAP_P(( LDAP *ld, LDAPMessage *ref ));
-LDAP_F int ldap_count_reference LDAP_P(( LDAP *ld, LDAPMessage *chain ));
+LDAP_F int ldap_count_references LDAP_P(( LDAP *ld, LDAPMessage *chain ));
+LDAP_F int ldap_parse_reference LDAP_P((
+       LDAP                    *ld,
+       LDAPMessage             *ref,
+       char                    ***referralsp,
+       LDAPControl             ***serverctrls,
+       int                             freeit));
 
 
 /*
@@ -730,6 +763,10 @@ LDAP_F int ldap_count_reference LDAP_P(( LDAP *ld, LDAPMessage *chain ));
 LDAP_F LDAPMessage *ldap_first_entry LDAP_P(( LDAP *ld, LDAPMessage *chain ));
 LDAP_F LDAPMessage *ldap_next_entry LDAP_P(( LDAP *ld, LDAPMessage *entry ));
 LDAP_F int ldap_count_entries LDAP_P(( LDAP *ld, LDAPMessage *chain ));
+LDAP_F int ldap_get_entry_controls LDAP_P((
+       LDAP                    *ld,
+       LDAPMessage             *entry,
+       LDAPControl             ***serverctrls));
 
 
 /*