cleanup

[openldap] / include / ldap.h

diff --git a/include/ldap.h b/include/ldap.h
index 0d65ea29e42326aa5b051eda60248c848064f6f7..c567d6adcc0389b41f205d4b6d12286f1bf4dc33 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -120,6 +120,7 @@ LDAP_BEGIN_DECL
 #define LDAP_OPT_URI                           0x5006
 #define LDAP_OPT_REFERRAL_URLS      0x5007  /* Referral URLs */
 #define LDAP_OPT_SOCKBUF            0x5008  /* sockbuf */
+#define LDAP_OPT_DEFBASE               0x5009  /* searchbase */
 
 /* OpenLDAP TLS options */
 #define LDAP_OPT_X_TLS                         0x6000
@@ -137,6 +138,7 @@ LDAP_BEGIN_DECL
 #define LDAP_OPT_X_TLS_CONNECT_CB      0x600c
 #define LDAP_OPT_X_TLS_CONNECT_ARG     0x600d
 #define LDAP_OPT_X_TLS_DHFILE          0x600e
+#define LDAP_OPT_X_TLS_NEWCTX          0x600f
 
 #define LDAP_OPT_X_TLS_NEVER   0
 #define LDAP_OPT_X_TLS_HARD            1
@@ -357,6 +359,14 @@ typedef struct ldapcontrol {
 #define LDAP_URLEXT_X_FAILEDNAME       "x-failedName"
 #endif
 
+#ifdef LDAP_DEVEL
+#define LDAP_X_TXN                                             "1.3.6.1.4.1.4203.666.11.7" /* temp */
+#define LDAP_EXOP_X_TXN_START                  LDAP_X_TXN ".1"
+#define LDAP_CONTROL_X_TXN_SPEC                        LDAP_X_TXN ".2"
+#define LDAP_EXOP_X_TXN_END                            LDAP_X_TXN ".3"
+#define LDAP_EXOP_X_TXN_ABORTED_NOTICE LDAP_X_TXN ".4"
+#endif
+
 /* LDAP Features */
 #define LDAP_FEATURE_ALL_OP_ATTRS      "1.3.6.1.4.1.4203.1.5.1"        /* RFC 3673 */
 #define LDAP_FEATURE_OBJECTCLASS_ATTRS \
@@ -618,6 +628,11 @@ typedef struct ldapcontrol {
 #define LDAP_X_INVALIDREFERENCE                        0x4112
 #endif
 
+#ifdef LDAP_X_TXN
+#define LDAP_X_TXN_SPECIFY_OKAY                0x4120
+#define LDAP_X_TXN_ID_INVALID          0x4121
+#endif
+
 /* API Error Codes
  *
  * Based on draft-ietf-ldap-c-api-xx
@@ -769,6 +784,19 @@ ldap_set_nextref_proc LDAP_P((
        LDAP_NEXTREF_PROC *nextref_proc,
        void *params ));
 
+/* V3 URLLIST Function Callback Prototype */
+typedef int (LDAP_URLLIST_PROC) LDAP_P((
+       LDAP *ld, 
+       LDAPURLDesc **urllist,
+       LDAPURLDesc **url,
+       void *params ));
+
+LDAP_F( int )
+ldap_set_urllist_proc LDAP_P((
+       LDAP *ld,
+       LDAP_URLLIST_PROC *urllist_proc,
+       void *params ));
+
 /*
  * in controls.c:
  */
@@ -2060,5 +2088,38 @@ ldap_refresh_s LDAP_P((
        LDAPControl **sctrls,
        LDAPControl **cctrls ));
 
+/*
+ * LDAP Transactions
+ */
+#ifdef LDAP_X_TXN
+LDAP_F( int )
+ldap_txn_start LDAP_P(( LDAP *ld,
+       LDAPControl             **sctrls,
+       LDAPControl             **cctrls,
+       int                             *msgidp ));
+
+LDAP_F( int )
+ldap_txn_start_s LDAP_P(( LDAP *ld,
+       LDAPControl **sctrl,
+       LDAPControl **cctrl,
+       struct berval **rettxnid ));
+
+LDAP_F( int )
+ldap_txn_end LDAP_P(( LDAP *ld,
+       int     commit,
+       struct berval   *txnid,
+       LDAPControl             **sctrls,
+       LDAPControl             **cctrls,
+       int                             *msgidp ));
+
+LDAP_F( int )
+ldap_txn_end_s LDAP_P(( LDAP *ld,
+       int     commit,
+       struct berval *txnid,
+       LDAPControl **sctrl,
+       LDAPControl **cctrl,
+       int *retidp ));
+#endif
+
 LDAP_END_DECL
 #endif /* _LDAP_H */