From 377aa0be68a4f548a75e1aef8490e43723a654b4 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Wed, 15 Feb 2006 21:30:35 +0000 Subject: [PATCH] ITS#4404: fix typo in ValuesReturnFilter control OID, add temporary server-side support for old OID. --- include/ldap.h | 4 +++- servers/slapd/controls.c | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/ldap.h b/include/ldap.h index 5c7e0b121a..55e9af68fd 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 33d71d1f01..050f0ac7e1 100644 --- a/servers/slapd/controls.c +++ b/servers/slapd/controls.c @@ -128,6 +128,13 @@ static struct slap_control control_defs[] = { SLAP_CTRL_GLOBAL|SLAP_CTRL_SEARCH, NULL, NULL, parseValuesReturnFilter, LDAP_SLIST_ENTRY_INITIALIZER(next) }, +#ifdef LDAP_CONTROL_X_VALUESRETURNFILTER + { LDAP_CONTROL_X_VALUESRETURNFILTER /* bad OID */, + (int)offsetof(struct slap_control_ids, sc_valuesReturnFilter), + SLAP_CTRL_GLOBAL|SLAP_CTRL_SEARCH|SLAP_CTRL_HIDE, + NULL, NULL, + parseValuesReturnFilter, LDAP_SLIST_ENTRY_INITIALIZER(next) }, +#endif { LDAP_CONTROL_PAGEDRESULTS, (int)offsetof(struct slap_control_ids, sc_pagedResults), SLAP_CTRL_SEARCH, -- 2.39.5