lber.h: added #include <stddef.h> conditional on LBER_SIZE_T_DEFINED

ldap.h: added #include <lber.h>
ldap.h: added tags for extended operations

diff --git a/include/lber.h b/include/lber.h
index 3bf2c7888df20032276a9e6c01099234e4872db3..129bfdcf3a7cb3b5948bad264a37e5887b2128ac 100644 (file)
--- a/include/lber.h
+++ b/include/lber.h
@@ -24,6 +24,10 @@
 
 #include <ldap_cdefs.h>
 
+#ifndef LBER_SIZE_T_DEFINED
+#include <stddef.h>
+#endif
+
 LDAP_BEGIN_DECL
 
 /* Overview of LBER tag construction
@@ -322,6 +326,8 @@ ber_printf LDAP_P((
        BerElement *ber,
        LDAP_CONST char *fmt,
        ... ));
+
+
 /*
  * in io.c:
  */
@@ -378,9 +384,6 @@ ber_reset LDAP_P((
        BerElement *ber,
        int was_writing ));
 
-/*
- * LBER draft-ietf-ldapext-ldap-c-api-01 routines
- */
 LDAP_F( BerElement * )
 ber_init LDAP_P((
        struct berval *bv ));

diff --git a/include/ldap.h b/include/ldap.h
index f5bcf92cfa84a8a9e345c66e76f6479b393a8196..d059f91573ca34d05b0a7a999bc801b43d4d651d 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -24,6 +24,9 @@
 
 #include <ldap_cdefs.h>
 
+/* draft spec requires ldap.h include lber declarations */
+#include <lber.h>
+
 LDAP_BEGIN_DECL
 
 #define LDAP_VERSION1  1
@@ -176,10 +179,19 @@ typedef struct ldapcontrol {
 #define LDAP_TAG_LDAPDN                0x04UL  /* octect string */
 #define LDAP_TAG_CONTROLS      0xa0UL  /* context specific + constructed + 0 */
 #define LDAP_TAG_REFERRAL      0xa3UL  /* context specific + constructed + 3 */
+
 #define LDAP_TAG_NEWSUPERIOR   0x80UL  /* context-specific + primitive + 0 */
 
+#define LDAP_TAG_EXOP_REQ_OID   0x80UL /* context specific + primitive */
+#define LDAP_TAG_EXOP_REQ_VALUE 0x81UL /* context specific + primitive */
+#define LDAP_TAG_EXOP_RES_OID   0x8aUL /* context specific + primitive */
+#define LDAP_TAG_EXOP_RES_VALUE 0x8bUL /* context specific + primitive */
+
 #define LDAP_TAG_SASL_RES_CREDS        0x87UL  /* context specific + primitive */
 
+
+
+
 /* possible operations a client can invoke */
 #define LDAP_REQ_BIND                  0x60UL  /* application + constructed */
 #define LDAP_REQ_UNBIND                        0x42UL  /* application + primitive   */