Sync with HEAD

[openldap] / include / ldap.h

diff --git a/include/ldap.h b/include/ldap.h
index 4817393590216df2fb7d01b896842a4ca15ac82d..2c5adba3281ddd90913b252da2f6b79cb6270271 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -220,6 +220,9 @@ typedef struct ldapcontrol {
 #define LDAP_CONTROL_NOOP                              "1.3.6.1.4.1.4203.666.5.2"
 #define LDAP_CONTROL_PRE_READ                  "1.3.6.1.4.1.4203.666.5.10.1"
 #define LDAP_CONTROL_POST_READ                 "1.3.6.1.4.1.4203.666.5.10.2"
+#define LDAP_CONTROL_NO_SUBORDINATES   "1.3.6.1.4.1.4203.666.5.11"
+#define LDAP_CONTROL_MANAGEDIT                 "1.3.6.1.4.1.4203.666.5.12"
+#define LDAP_CONTROL_SLURP                             "1.3.6.1.4.1.4203.666.5.13"
 
 /* LDAP Duplicated Entry Control Extension *//* not implemented in slapd(8) */
 #define LDAP_CONTROL_DUPENT_REQUEST            "2.16.840.1.113719.1.27.101.1"
@@ -277,7 +280,7 @@ typedef struct ldapcontrol {
 
 /* LDAP Chaining Behavior Control *//* work in progress */
 /* <draft-sermersheim-ldap-chaining>;
- * see also LDAP_REQUIRES_CHAINING, LDAP_CANNOT_CHAIN */
+ * see also LDAP_NO_REFERRALS_FOUND, LDAP_CANNOT_CHAIN */
 #ifdef LDAP_DEVEL
 #define LDAP_CONTROL_X_CHAINING_BEHAVIOR       "1.3.6.1.4.1.4203.666.11.3"
 
@@ -579,7 +582,7 @@ typedef struct ldapcontrol {
 /* for the Chaining Behavior control (consecutive result codes requested;
  * see <draft-sermersheim-ldap-chaining> ) */
 #ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
-#define        LDAP_REQUIRES_CHAINING                  0x4110
+#define        LDAP_NO_REFERRALS_FOUND                 0x4110
 #define LDAP_CANNOT_CHAIN                      0x4111
 #endif
 
@@ -723,6 +726,17 @@ ldap_set_rebind_proc LDAP_P((
        LDAP_REBIND_PROC *rebind_proc,
        void *params ));
 
+/* V3 referral selection Function Callback Prototype */
+typedef int (LDAP_NEXTREF_PROC) LDAP_P((
+       LDAP *ld, char ***refsp, int *cntp,
+       void *params ));
+
+LDAP_F( int )
+ldap_set_nextref_proc LDAP_P((
+       LDAP *ld,
+       LDAP_NEXTREF_PROC *nextref_proc,
+       void *params ));
+
 /*
  * in controls.c:
  */