From 35492ada90f691757f014fcde0353717800d0bd2 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 7 Jun 2009 11:26:25 +0200 Subject: Fix after making tldap independent of ldap.h --- source3/include/tldap.h | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) (limited to 'source3/include') diff --git a/source3/include/tldap.h b/source3/include/tldap.h index 042f3d95c4..9ce5c8bfa8 100644 --- a/source3/include/tldap.h +++ b/source3/include/tldap.h @@ -145,27 +145,30 @@ const char *tldap_ctx_diagnosticmessage(struct tldap_context *ctx); const char *tldap_ctx_referral(struct tldap_context *ctx); const char *tldap_err2string(int rc); -#define TLDAP_REQ_BIND (0) -#define TLDAP_RES_BIND (1) -#define TLDAP_REQ_UNBIND (2) -#define TLDAP_REQ_SEARCH (3) -#define TLDAP_RES_SEARCH_ENTRY (4) -#define TLDAP_RES_SEARCH_RESULT (5) -#define TLDAP_REQ_MODIFY (6) -#define TLDAP_RES_MODIFY (7) -#define TLDAP_REQ_ADD (8) -#define TLDAP_RES_ADD (9) -#define TLDAP_REQ_DELETE (10) -#define TLDAP_RES_DELETE (11) -#define TLDAP_REQ_MODDN (12) -#define TLDAP_RES_MODDN (13) -#define TLDAP_REQ_COMPARE (14) -#define TLDAP_RES_COMPARE (15) -#define TLDAP_REQ_ABANDON (16) -#define TLDAP_RES_SEARCH_REFERENCE (19) -#define TLDAP_REQ_EXTENDED (23) -#define TLDAP_RES_EXTENDED (24) -#define TLDAP_RES_INTERMEDIATE (25) +/* + * "+ 0x60" is from ASN1_APPLICATION + */ +#define TLDAP_REQ_BIND (0 + 0x60) +#define TLDAP_RES_BIND (1 + 0x60) +#define TLDAP_REQ_UNBIND (2 + 0x60) +#define TLDAP_REQ_SEARCH (3 + 0x60) +#define TLDAP_RES_SEARCH_ENTRY (4 + 0x60) +#define TLDAP_RES_SEARCH_RESULT (5 + 0x60) +#define TLDAP_REQ_MODIFY (6 + 0x60) +#define TLDAP_RES_MODIFY (7 + 0x60) +#define TLDAP_REQ_ADD (8 + 0x60) +#define TLDAP_RES_ADD (9 + 0x60) +#define TLDAP_REQ_DELETE (10 + 0x60) +#define TLDAP_RES_DELETE (11 + 0x60) +#define TLDAP_REQ_MODDN (12 + 0x60) +#define TLDAP_RES_MODDN (13 + 0x60) +#define TLDAP_REQ_COMPARE (14 + 0x60) +#define TLDAP_RES_COMPARE (15 + 0x60) +#define TLDAP_REQ_ABANDON (16 + 0x60) +#define TLDAP_RES_SEARCH_REFERENCE (19 + 0x60) +#define TLDAP_REQ_EXTENDED (23 + 0x60) +#define TLDAP_RES_EXTENDED (24 + 0x60) +#define TLDAP_RES_INTERMEDIATE (25 + 0x60) #define TLDAP_SUCCESS (0x00) #define TLDAP_OPERATIONS_ERROR (0x01) -- cgit