IANA assigned OIDs

diff --git a/CHANGES b/CHANGES
index 7c152b2af901ca48ecd501fbb7c483ad60f7fca5..454ce798e540abdab06c0474c20395a39b9e0ff4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -53,8 +53,7 @@ OpenLDAP 2.3.5 Release
        Fixed slapd authzTo/From syntax issue (ITS#3921)
        Fixed libldap start_tls referral chasing (ITS#3791)
        Fixed libldap referral chasing issues (ITS#2894,3578)
-    Updated Assertion control to use IANA-assigned OID
-    Updated pre/post read controls to use IANA-assigned OIDs
+    Use IANA-assigned OIDs for recently approved LDAP extensions
        Removed lint (ITS#3857)
        Build Environment
                Upgraded shtool (ITS#3752)

diff --git a/include/ldap.h b/include/ldap.h
index f241a2be8cec1a1b937e6946ffdecc13b57b99ea..24cc7c86e55a3237e5ade5ad9e5bb9ea247bd62f 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -346,10 +346,10 @@ typedef struct ldapcontrol {
 #define LDAP_FEATURE_ABSOLUTE_FILTERS "1.3.6.1.4.1.4203.1.5.3"  /* (&) (|) */
 #define LDAP_FEATURE_LANGUAGE_TAG_OPTIONS "1.3.6.1.4.1.4203.1.5.4"
 #define LDAP_FEATURE_LANGUAGE_RANGE_OPTIONS "1.3.6.1.4.1.4203.1.5.5"
+#define LDAP_FEATURE_MODIFY_INCREMENT "1.3.6.1.1.14"
 
 #ifdef LDAP_DEVEL
 /* LDAP Experimental (works in progress) Features */
-#define LDAP_FEATURE_MODIFY_INCREMENT "1.3.6.1.4.1.4203.666.8.2"
 #define LDAP_FEATURE_SUBORDINATE_SCOPE \
        "1.3.6.1.4.1.4203.666.8.1" /* "children" */
 #define LDAP_FEATURE_CHILDREN_SCOPE LDAP_FEATURE_SUBORDINATE_SCOPE

diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index 94d37d7a40e7a526ad37f195115cc03c14b0f8f0..3bfbdf179e22a8fb4fc3fda508cff74ddb34bf84 100644 (file)
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -32,9 +32,6 @@ static SLAP_CTRL_PARSE_FN parseProxyAuthz;
 static SLAP_CTRL_PARSE_FN parseManageDIT;
 #endif
 static SLAP_CTRL_PARSE_FN parseManageDSAit;
-#ifdef LDAP_CONTROL_MODIFY_INCREMENT
-static SLAP_CTRL_PARSE_FN parseModifyIncrement;
-#endif
 static SLAP_CTRL_PARSE_FN parseNoOp;
 static SLAP_CTRL_PARSE_FN parsePagedResults;
 #ifdef LDAP_DEVEL
@@ -162,12 +159,6 @@ static struct slap_control control_defs[] = {
                (int)offsetof(struct slap_control_ids, sc_noOp),
                SLAP_CTRL_HIDE|SLAP_CTRL_ACCESS, NULL,
                parseNoOp, LDAP_SLIST_ENTRY_INITIALIZER(next) },
-#ifdef LDAP_CONTROL_MODIFY_INCREMENT
-       { LDAP_CONTROL_MODIFY_INCREMENT,
-               (int)offsetof(struct slap_control_ids, sc_modifyIncrement),
-               SLAP_CTRL_HIDE|SLAP_CTRL_MODIFY, NULL,
-               parseModifyIncrement, LDAP_SLIST_ENTRY_INITIALIZER(next) },
-#endif
 #ifdef LDAP_DEVEL
        { LDAP_CONTROL_MANAGEDIT,
                (int)offsetof(struct slap_control_ids, sc_manageDIT),
@@ -703,34 +694,6 @@ return_results:
        return rs->sr_err;
 }
 
-#ifdef LDAP_CONTROL_MODIFY_INCREMENT
-static int parseModifyIncrement (
-       Operation *op,
-       SlapReply *rs,
-       LDAPControl *ctrl )
-{
-#if 0
-       if ( op->o_modifyIncrement != SLAP_CONTROL_NONE ) {
-               rs->sr_text = "modifyIncrement control specified multiple times";
-               return LDAP_PROTOCOL_ERROR;
-       }
-#endif
-
-       if ( ctrl->ldctl_value.bv_len ) {
-               rs->sr_text = "modifyIncrement control value not empty";
-               return LDAP_PROTOCOL_ERROR;
-       }
-
-#if 0
-       op->o_modifyIncrement = ctrl->ldctl_iscritical
-               ? SLAP_CONTROL_CRITICAL
-               : SLAP_CONTROL_NONCRITICAL;
-#endif
-
-       return LDAP_SUCCESS;
-}
-#endif
-
 #ifdef LDAP_DEVEL
 static int parseManageDIT (
        Operation *op,

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 628ddea77cd13aca89dac421590641802f5bfbf0..810c5316c0c823e57500e96748d7157dab463d22 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -29,6 +29,7 @@
 #endif
 
 static struct berval supportedFeatures[] = {
+       BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT),         /* Modify/increment */
        BER_BVC(LDAP_FEATURE_ALL_OP_ATTRS),                     /* All Op Attrs (+) */
        BER_BVC(LDAP_FEATURE_OBJECTCLASS_ATTRS),        /* OCs in Attrs List (@class) */
        BER_BVC(LDAP_FEATURE_ABSOLUTE_FILTERS),         /* (&) and (|) search filters */
@@ -36,9 +37,6 @@ static struct berval supportedFeatures[] = {
        BER_BVC(LDAP_FEATURE_LANGUAGE_RANGE_OPTIONS),/* Language Range Options */
 #ifdef LDAP_FEATURE_SUBORDINATE_SCOPE
        BER_BVC(LDAP_FEATURE_SUBORDINATE_SCOPE),        /* "children" search scope */
-#endif
-#ifdef LDAP_FEATURE_MODIFY_INCREMENT
-       BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT),         /* Modify/increment */
 #endif
        {0,NULL}
 };