X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fldap.h;h=36221c1c1a4e6d43199345c47df0bc1a0b6e687f;hb=d129f71b40f1d5cd60975dc5e9f45c4c497e2fd4;hp=6fbe9b1bed7514d9439f2ce92de663de59fd8386;hpb=543aafd99165203c6c5efc7dcf3add210cface7a;p=openldap

diff --git a/include/ldap.h b/include/ldap.h
index 6fbe9b1bed..36221c1c1a 100644
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -72,6 +72,7 @@ LDAP_BEGIN_DECL
 #define LDAP_ROOT_DSE				""
 #define LDAP_NO_ATTRS				"1.1"
 #define LDAP_ALL_USER_ATTRIBUTES	"*"
+#define LDAP_ALL_OPERATIONAL_ATTRIBUTES	"+"
 
 /*
  * LDAP_OPTions defined by draft-ldapext-ldap-c-api-02
@@ -111,6 +112,7 @@ LDAP_BEGIN_DECL
 #define LDAP_OPT_TIMEOUT			0x5002	/* default timeout */
 #define LDAP_OPT_REFHOPLIMIT		0x5003	/* ref hop limit */
 #define LDAP_OPT_MATCHED_DN			0x5004	/* should have been in draft */
+#define LDAP_OPT_NETWORK_TIMEOUT        0x5005  /* socket level timeout */
 
 /* TLS options */
 #define LDAP_OPT_X_TLS_CACERTFILE	0x6001
@@ -266,13 +268,13 @@ typedef struct ldapcontrol {
 #define LDAP_FILTER_LE		(ber_tag_t) 0xa6U	/* context specific + constructed */
 #define LDAP_FILTER_PRESENT	(ber_tag_t) 0x87U	/* context specific + primitive   */
 #define LDAP_FILTER_APPROX	(ber_tag_t) 0xa8U	/* context specific + constructed */
-#define LDAP_FILTER_EXTENDED	(ber_tag_t) 0xa9U	/* context specific + constructed */
+#define LDAP_FILTER_EXT		(ber_tag_t) 0xa9U	/* context specific + constructed */
 
 /* extended filter component types */
-#define LDAP_FILTER_EXTENDED_OID	(ber_tag_t) 0x81U	/* context specific */
-#define LDAP_FILTER_EXTENDED_TYPE	(ber_tag_t) 0x82U	/* context specific */
-#define LDAP_FILTER_EXTENDED_VALUE	(ber_tag_t) 0x83U	/* context specific */
-#define LDAP_FILTER_EXTENDED_DNATTRS	(ber_tag_t) 0x84U	/* context specific */
+#define LDAP_FILTER_EXT_OID	(ber_tag_t) 0x81U	/* context specific */
+#define LDAP_FILTER_EXT_TYPE	(ber_tag_t) 0x82U	/* context specific */
+#define LDAP_FILTER_EXT_VALUE	(ber_tag_t) 0x83U	/* context specific */
+#define LDAP_FILTER_EXT_DNATTRS	(ber_tag_t) 0x84U	/* context specific */
 
 /* substring filter component types */
 #define LDAP_SUBSTRING_INITIAL	(ber_tag_t) 0x80U	/* context specific */