From 4225b120603dcff148e3ca29c1f3d46e3e5798a7 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Mon, 15 Sep 2014 19:23:09 +0100 Subject: [PATCH] LDAP_TXN is now RFC 5805 --- include/ldap.h | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/include/ldap.h b/include/ldap.h index 288fab37c7..824c50e4f9 100644 --- a/include/ldap.h +++ b/include/ldap.h @@ -422,11 +422,17 @@ typedef struct ldapcontrol { #define LDAP_URLEXT_X_SEARCHEDSUBTREE "x-searchedSubtree" #define LDAP_URLEXT_X_FAILEDNAME "x-failedName" -#define LDAP_X_TXN "1.3.6.1.4.1.4203.666.11.7" /* tmp */ -#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" +#define LDAP_TXN "1.3.6.1.1.21" /* RFC 5805 */ +#define LDAP_EXOP_TXN_START LDAP_X_TXN ".1" +#define LDAP_CONTROL_TXN_SPEC LDAP_X_TXN ".2" +#define LDAP_EXOP_TXN_END LDAP_X_TXN ".3" +#define LDAP_EXOP_TXN_ABORTED_NOTICE LDAP_X_TXN ".4" + +#define LDAP_X_TXN LDAP_TXN +#define LDAP_EXOP_X_TXN_START LDAP_EXOP_TXN_START +#define LDAP_CONTROL_X_TXN_SPEC LDAP_CONTROL_TXN_SPEC +#define LDAP_EXOP_X_TXN_END LDAP_EXOP_TXN_END +#define LDAP_EXOP_X_TXN_ABORTED_NOTICE LDAP_EXOP_TXN_ABORTED_NOTICE /* LDAP Features */ #define LDAP_FEATURE_ALL_OP_ATTRS "1.3.6.1.4.1.4203.1.5.1" /* RFC 3673 */ -- 2.39.5