Commit 2d53302f authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Control OID changes from HEAD

ready for release
parent 638e8b14
OpenLDAP 2.3 Change Log OpenLDAP 2.3 Change Log
OpenLDAP 2.3.5 Engineering OpenLDAP 2.3.5 Release
Fixed slapd integerBitOr/AndMatch logic (ITS#3782) Fixed slapd integerBitOr/AndMatch logic (ITS#3782)
Fixed slapd substrings filter length checks (ITS#3790) Fixed slapd substrings filter length checks (ITS#3790)
Fixed slapd thread pool initialization (ITS#3793) Fixed slapd thread pool initialization (ITS#3793)
...@@ -31,6 +31,8 @@ OpenLDAP 2.3.5 Engineering ...@@ -31,6 +31,8 @@ OpenLDAP 2.3.5 Engineering
Fixed slapd authzTo/From syntax issue (ITS#3921) Fixed slapd authzTo/From syntax issue (ITS#3921)
Fixed libldap start_tls referral chasing (ITS#3791) Fixed libldap start_tls referral chasing (ITS#3791)
Fixed libldap referral chasing issues (ITS#2894,ITS#3578) Fixed libldap referral chasing issues (ITS#2894,ITS#3578)
Updated Assertion control to use IANA-assigned OID
Updated pre/post read controls to use IANA-assigned OIDs
Build Environment Build Environment
Upgraded shtool (ITS#3752) Upgraded shtool (ITS#3752)
Upgraded config.guess/config.sub Upgraded config.guess/config.sub
......
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
ol_package=OpenLDAP ol_package=OpenLDAP
ol_major=2 ol_major=2
ol_minor=3 ol_minor=3
ol_patch=X ol_patch=5
ol_api_inc=20304 ol_api_inc=20305
ol_api_current=0 ol_api_current=1
ol_api_revision=4 ol_api_revision=0
ol_api_age=0 ol_api_age=1
ol_release_date="2005/06/10" ol_release_date="2005/08/13"
...@@ -207,6 +207,9 @@ typedef struct ldapcontrol { ...@@ -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_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_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_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) */ /* standard track - not implemented in slapd(8) */
#define LDAP_CONTROL_SORTREQUEST "1.2.840.113556.1.4.473" /* RFC 2891 */ #define LDAP_CONTROL_SORTREQUEST "1.2.840.113556.1.4.473" /* RFC 2891 */
...@@ -216,10 +219,7 @@ typedef struct ldapcontrol { ...@@ -216,10 +219,7 @@ typedef struct ldapcontrol {
#define LDAP_CONTROL_PROXY_AUTHZ "2.16.840.1.113730.3.4.18" #define LDAP_CONTROL_PROXY_AUTHZ "2.16.840.1.113730.3.4.18"
/* various works in progress */ /* 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_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_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_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" #define LDAP_CONTROL_SLURP "1.3.6.1.4.1.4203.666.5.13"
......
...@@ -104,15 +104,15 @@ static char *proxy_authz_extops[] = { ...@@ -104,15 +104,15 @@ static char *proxy_authz_extops[] = {
static struct slap_control control_defs[] = { static struct slap_control control_defs[] = {
{ LDAP_CONTROL_ASSERT, { LDAP_CONTROL_ASSERT,
(int)offsetof(struct slap_control_ids, sc_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) }, parseAssert, LDAP_SLIST_ENTRY_INITIALIZER(next) },
{ LDAP_CONTROL_PRE_READ, { LDAP_CONTROL_PRE_READ,
(int)offsetof(struct slap_control_ids, sc_preRead), (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) }, parsePreRead, LDAP_SLIST_ENTRY_INITIALIZER(next) },
{ LDAP_CONTROL_POST_READ, { LDAP_CONTROL_POST_READ,
(int)offsetof(struct slap_control_ids, sc_postRead), (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) }, parsePostRead, LDAP_SLIST_ENTRY_INITIALIZER(next) },
{ LDAP_CONTROL_VALUESRETURNFILTER, { LDAP_CONTROL_VALUESRETURNFILTER,
(int)offsetof(struct slap_control_ids, sc_valuesReturnFilter), (int)offsetof(struct slap_control_ids, sc_valuesReturnFilter),
......
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