From 94338378cf25e03bcce7752cfb07a02e99debb42 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Wed, 15 Feb 2006 22:32:04 +0000 Subject: [PATCH] ITS#4404: values return filter OID fix --- CHANGES | 1 + include/ldap.h | 4 +++- servers/slapd/controls.c | 6 ++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index cc0f507a61..ba30718391 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,7 @@ OpenLDAP 2.3 Change Log OpenLDAP 2.3.20 Engineering Added libldap SASL workaround for broken LDAP servers (ITS#4391) + Fixed libldap/slapd valuesReturnFilter OID (ITS#4404) Fixed slapd config_generic_wrapper missing parameter bug (ITS#4376) Fixed slapd extensible filter value normalization bug (ITS#4380) Fixed slapd context CSN not updating issue (ITS#4384) diff --git a/include/ldap.h b/include/ldap.h index 1bca6e9c97..9f47c698fd 100644 --- a/include/ldap.h +++ b/include/ldap.h @@ -208,7 +208,9 @@ typedef struct ldapcontrol { #define LDAP_CONTROL_PROXY_AUTHZ "2.16.840.1.113730.3.4.18" /* RFC 4370 */ #define LDAP_CONTROL_SUBENTRIES "1.3.6.1.4.1.4203.1.10.1" /* RFC 3672 */ -#define LDAP_CONTROL_VALUESRETURNFILTER "1.2.826.0.1.334810.2.3"/* RFC 3876 */ +#define LDAP_CONTROL_VALUESRETURNFILTER "1.2.826.0.1.3344810.2.3"/* RFC 3876 */ +#define LDAP_CONTROL_X_VALUESRETURNFILTER "1.2.826.0.1.334810.2.3"/* bad OID */ + #define LDAP_CONTROL_ASSERT "1.3.6.1.1.12" /* RFC TBD */ #define LDAP_CONTROL_PRE_READ "1.3.6.1.1.13.1" /* RFC TBD */ #define LDAP_CONTROL_POST_READ "1.3.6.1.1.13.2" /* RFC TBD */ diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c index f88ce1171b..f4c3eaedc8 100644 --- a/servers/slapd/controls.c +++ b/servers/slapd/controls.c @@ -117,6 +117,12 @@ static struct slap_control control_defs[] = { (int)offsetof(struct slap_control_ids, sc_valuesReturnFilter), SLAP_CTRL_GLOBAL|SLAP_CTRL_SEARCH, NULL, parseValuesReturnFilter, LDAP_SLIST_ENTRY_INITIALIZER(next) }, +#ifdef LDAP_CONTROL_X_VALUESRETURNFILTER + { LDAP_CONTROL_X_VALUESRETURNFILTER, + (int)offsetof(struct slap_control_ids, sc_valuesReturnFilter), + SLAP_CTRL_GLOBAL|SLAP_CTRL_SEARCH, NULL, + parseValuesReturnFilter, LDAP_SLIST_ENTRY_INITIALIZER(next) }, +#endif { LDAP_CONTROL_PAGEDRESULTS, (int)offsetof(struct slap_control_ids, sc_pagedResults), SLAP_CTRL_SEARCH, NULL, -- 2.39.5