fix typo (ITS#4784)

[openldap] / servers / slapd / slapi / slapi_pblock.c

diff --git a/servers/slapd/slapi/slapi_pblock.c b/servers/slapd/slapi/slapi_pblock.c
index d27a32e1c21880c3e99084d4207b475b5692a761..30fd74292cf17cb28cc1c644c91d2e3376064b00 100644 (file)
--- a/servers/slapd/slapi/slapi_pblock.c
+++ b/servers/slapd/slapi/slapi_pblock.c
@@ -64,7 +64,7 @@ pblock_get_param_class( int param )
        case SLAPI_DB2LDIF_PRINTKEY:
        case SLAPI_LDIF2DB_REMOVEDUPVALS:
        case SLAPI_MANAGEDSAIT:
-       case SLAPI_X_MANAGEDIT:
+       case SLAPI_X_RELAX:
        case SLAPI_X_OPERATION_NO_SCHEMA_CHECK:
        case SLAPI_IS_REPLICATED_OPERATION:
        case SLAPI_X_CONN_IS_UDP:
@@ -168,6 +168,16 @@ pblock_get_param_class( int param )
        case SLAPI_X_PLUGIN_PRE_GROUP_FN:
        case SLAPI_X_PLUGIN_POST_GROUP_FN:
        case SLAPI_PLUGIN_AUDIT_FN:
+       case SLAPI_PLUGIN_INTERNAL_PRE_BIND_FN:
+       case SLAPI_PLUGIN_INTERNAL_PRE_UNBIND_FN:
+       case SLAPI_PLUGIN_INTERNAL_PRE_SEARCH_FN:
+       case SLAPI_PLUGIN_INTERNAL_PRE_COMPARE_FN:
+       case SLAPI_PLUGIN_INTERNAL_PRE_ABANDON_FN:
+       case SLAPI_PLUGIN_INTERNAL_POST_BIND_FN:
+       case SLAPI_PLUGIN_INTERNAL_POST_UNBIND_FN:
+       case SLAPI_PLUGIN_INTERNAL_POST_SEARCH_FN:
+       case SLAPI_PLUGIN_INTERNAL_POST_COMPARE_FN:
+       case SLAPI_PLUGIN_INTERNAL_POST_ABANDON_FN:
                return PBLOCK_CLASS_FUNCTION_POINTER;
                break;
 
@@ -473,7 +483,7 @@ pblock_get( Slapi_PBlock *pb, int param, void **value )
                break;
        case SLAPI_X_OPERATION_DELETE_GLUE_PARENT:
                PBLOCK_ASSERT_OP( pb, 0 );
-               *((ber_tag_t *)value) = pb->pb_op->o_delete_glue_parent;
+               *((int *)value) = pb->pb_op->o_delete_glue_parent;
                break;
        case SLAPI_X_OPERATION_NO_SCHEMA_CHECK:
                PBLOCK_ASSERT_OP( pb, 0 );
@@ -487,12 +497,17 @@ pblock_get( Slapi_PBlock *pb, int param, void **value )
 
                        rc = mods_structural_class( pb->pb_op->ora_modlist,
                                &tmpval, &pb->pb_rs->sr_text,
-                               pb->pb_textbuf, sizeof( pb->pb_textbuf ));
+                               pb->pb_textbuf, sizeof( pb->pb_textbuf ),
+                               pb->pb_op->o_tmpmemctx );
                        *((char **)value) = tmpval.bv_val;
                } else {
                        rc = PBLOCK_ERROR;
                }
                break;
+       case SLAPI_X_OPERATION_NO_SUBORDINATE_GLUE:
+               PBLOCK_ASSERT_OP( pb, 0 );
+               *((int *)value) = pb->pb_op->o_no_subordinate_glue;
+               break;
        case SLAPI_REQCONTROLS:
                PBLOCK_ASSERT_OP( pb, 0 );
                *((LDAPControl ***)value) = pb->pb_op->o_ctrls;
@@ -505,9 +520,9 @@ pblock_get( Slapi_PBlock *pb, int param, void **value )
                PBLOCK_ASSERT_OP( pb, 0 );
                *((int *)value) = get_manageDSAit( pb->pb_op );
                break;
-       case SLAPI_X_MANAGEDIT:
+       case SLAPI_X_RELAX:
                PBLOCK_ASSERT_OP( pb, 0 );
-               *((int *)value) = get_manageDIT( pb->pb_op );
+               *((int *)value) = get_relax( pb->pb_op );
                break;
        case SLAPI_BACKEND:
                PBLOCK_ASSERT_OP( pb, 0 );
@@ -572,6 +587,12 @@ pblock_get( Slapi_PBlock *pb, int param, void **value )
                break;
        case SLAPI_CONN_DN:
                PBLOCK_ASSERT_CONN( pb );
+#if 0
+               /* This would be necessary to keep plugin compat after the fix in ITS#4158 */
+               if ( pb->pb_op->o_tag == LDAP_REQ_BIND && pb->pb_rs->sr_err == LDAP_SUCCESS )
+                       *((char **)value) = pb->pb_op->orb_edn.bv_val;
+               else
+#endif
                *((char **)value) = pb->pb_conn->c_dn.bv_val;
                break;
        case SLAPI_CONN_CLIENTIP:
@@ -590,14 +611,14 @@ pblock_get( Slapi_PBlock *pb, int param, void **value )
                break;
        case SLAPI_CONN_SERVERIP:
                PBLOCK_ASSERT_CONN( pb );
-               if ( strncmp( pb->pb_conn->c_peer_name.bv_val, "IP=", 3 ) == 0 )
+               if ( strncmp( pb->pb_conn->c_sock_name.bv_val, "IP=", 3 ) == 0 )
                        *((char **)value) = &pb->pb_conn->c_sock_name.bv_val[3];
                else
                        *value = NULL;
                break;
        case SLAPI_X_CONN_SERVERPATH:
                PBLOCK_ASSERT_CONN( pb );
-               if ( strncmp( pb->pb_conn->c_peer_name.bv_val, "PATH=", 3 ) == 0 )
+               if ( strncmp( pb->pb_conn->c_sock_name.bv_val, "PATH=", 3 ) == 0 )
                        *((char **)value) = &pb->pb_conn->c_sock_name.bv_val[5];
                else
                        *value = NULL;
@@ -873,6 +894,10 @@ pblock_set( Slapi_PBlock *pb, int param, void *value )
                PBLOCK_ASSERT_OP( pb, 0 );
                pb->pb_op->o_no_schema_check = *((int *)value);
                break;
+       case SLAPI_X_OPERATION_NO_SUBORDINATE_GLUE:
+               PBLOCK_ASSERT_OP( pb, 0 );
+               pb->pb_op->o_no_subordinate_glue = *((int *)value);
+               break;
        case SLAPI_REQCONTROLS:
                PBLOCK_ASSERT_OP( pb, 0 );
                pb->pb_op->o_ctrls = (LDAPControl **)value;
@@ -900,9 +925,9 @@ pblock_set( Slapi_PBlock *pb, int param, void *value )
                PBLOCK_ASSERT_OP( pb, 0 );
                pb->pb_op->o_managedsait = *((int *)value);
                break;
-       case SLAPI_X_MANAGEDIT:
+       case SLAPI_X_RELAX:
                PBLOCK_ASSERT_OP( pb, 0 );
-               pb->pb_op->o_managedit = *((int *)value);
+               pb->pb_op->o_relax = *((int *)value);
                break;
        case SLAPI_BACKEND:
                PBLOCK_ASSERT_OP( pb, 0 );