From: Kurt Zeilenga Date: Fri, 12 Aug 2005 18:08:15 +0000 (+0000) Subject: Replace 666 OIDs for Assertion/pre-read/post-read controls with X-Git-Tag: OPENLDAP_REL_ENG_2_2_MP~721 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7dec65ee109f296347b7e95a858ea52fe24da3e3;p=openldap Replace 666 OIDs for Assertion/pre-read/post-read controls with appropriate IANA assigned OIDs, and remove hide. --- diff --git a/include/ldap.h b/include/ldap.h index 4678bf57c7..f241a2be8c 100644 --- a/include/ldap.h +++ b/include/ldap.h @@ -207,6 +207,9 @@ typedef struct ldapcontrol { #define LDAP_CONTROL_SUBENTRIES "1.3.6.1.4.1.4203.1.10.1" /* RFC 3672 */ #define LDAP_CONTROL_PAGEDRESULTS "1.2.840.113556.1.4.319" /* RFC 2696 */ #define LDAP_CONTROL_VALUESRETURNFILTER "1.2.826.0.1.334810.2.3" /* RFC 3876 */ +#define LDAP_CONTROL_ASSERT "1.3.6.1.1.12" +#define LDAP_CONTROL_PRE_READ "1.3.6.1.1.13.1" +#define LDAP_CONTROL_POST_READ "1.3.6.1.1.13.2" /* standard track - not implemented in slapd(8) */ #define LDAP_CONTROL_SORTREQUEST "1.2.840.113556.1.4.473" /* RFC 2891 */ @@ -216,10 +219,7 @@ typedef struct ldapcontrol { #define LDAP_CONTROL_PROXY_AUTHZ "2.16.840.1.113730.3.4.18" /* various works in progress */ -#define LDAP_CONTROL_ASSERT "1.3.6.1.4.1.4203.666.5.9" #define LDAP_CONTROL_NOOP "1.3.6.1.4.1.4203.666.5.2" -#define LDAP_CONTROL_PRE_READ "1.3.6.1.4.1.4203.666.5.10.1" -#define LDAP_CONTROL_POST_READ "1.3.6.1.4.1.4203.666.5.10.2" #define LDAP_CONTROL_NO_SUBORDINATES "1.3.6.1.4.1.4203.666.5.11" #define LDAP_CONTROL_MANAGEDIT "1.3.6.1.4.1.4203.666.5.12" #define LDAP_CONTROL_SLURP "1.3.6.1.4.1.4203.666.5.13" diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c index 383b945e00..94d37d7a40 100644 --- a/servers/slapd/controls.c +++ b/servers/slapd/controls.c @@ -104,15 +104,15 @@ static char *proxy_authz_extops[] = { static struct slap_control control_defs[] = { { LDAP_CONTROL_ASSERT, (int)offsetof(struct slap_control_ids, sc_assert), - SLAP_CTRL_HIDE|SLAP_CTRL_ACCESS, NULL, + SLAP_CTRL_ACCESS, NULL, parseAssert, LDAP_SLIST_ENTRY_INITIALIZER(next) }, { LDAP_CONTROL_PRE_READ, (int)offsetof(struct slap_control_ids, sc_preRead), - SLAP_CTRL_HIDE|SLAP_CTRL_DELETE|SLAP_CTRL_MODIFY|SLAP_CTRL_RENAME, NULL, + SLAP_CTRL_DELETE|SLAP_CTRL_MODIFY|SLAP_CTRL_RENAME, NULL, parsePreRead, LDAP_SLIST_ENTRY_INITIALIZER(next) }, { LDAP_CONTROL_POST_READ, (int)offsetof(struct slap_control_ids, sc_postRead), - SLAP_CTRL_HIDE|SLAP_CTRL_ADD|SLAP_CTRL_MODIFY|SLAP_CTRL_RENAME, NULL, + SLAP_CTRL_ADD|SLAP_CTRL_MODIFY|SLAP_CTRL_RENAME, NULL, parsePostRead, LDAP_SLIST_ENTRY_INITIALIZER(next) }, { LDAP_CONTROL_VALUESRETURNFILTER, (int)offsetof(struct slap_control_ids, sc_valuesReturnFilter),