Commit 94338378 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

ITS#4404: values return filter OID fix

parent 4e0f8690
......@@ -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)
......
......@@ -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 */
......
......@@ -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,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment