Add missing break statement in switch for SLAPI_SEARCH_ATTRS handler

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

diff --git a/servers/slapd/slapi/slapi_pblock.c b/servers/slapd/slapi/slapi_pblock.c
index eafd4e2e19ea5ea44669a1204cd886b319615454..7e5339741911a77708b864df243f71b3a6e8200d 100644 (file)
--- a/servers/slapd/slapi/slapi_pblock.c
+++ b/servers/slapd/slapi/slapi_pblock.c
@@ -64,6 +64,8 @@ pblock_get_param_class( int param )
        case SLAPI_DB2LDIF_PRINTKEY:
        case SLAPI_LDIF2DB_REMOVEDUPVALS:
        case SLAPI_MANAGEDSAIT:
+       case SLAPI_X_MANAGEDIT:
+       case SLAPI_X_OPERATION_NO_SCHEMA_CHECK:
        case SLAPI_IS_REPLICATED_OPERATION:
        case SLAPI_X_CONN_IS_UDP:
        case SLAPI_X_CONN_SSF:
@@ -76,6 +78,7 @@ pblock_get_param_class( int param )
        case SLAPI_OPERATION_ID:
        case SLAPI_OPINITIATED_TIME:
        case SLAPI_ABANDON_MSGID:
+       case SLAPI_X_OPERATION_DELETE_GLUE_PARENT:
                return PBLOCK_CLASS_LONG_INTEGER;
                break;
 
@@ -461,6 +464,14 @@ pblock_get( Slapi_PBlock *pb, int param, void **value )
                PBLOCK_ASSERT_OP( pb, 0 );
                *((ber_tag_t *)value) = pb->pb_op->o_tag;
                break;
+       case SLAPI_X_OPERATION_DELETE_GLUE_PARENT:
+               PBLOCK_ASSERT_OP( pb, 0 );
+               *((ber_tag_t *)value) = pb->pb_op->o_delete_glue_parent;
+               break;
+       case SLAPI_X_OPERATION_NO_SCHEMA_CHECK:
+               PBLOCK_ASSERT_OP( pb, 0 );
+               *((int *)value) = get_no_schema_check( pb->pb_op );
+               break;
        case SLAPI_REQCONTROLS:
                PBLOCK_ASSERT_OP( pb, 0 );
                *((LDAPControl ***)value) = pb->pb_op->o_ctrls;
@@ -473,6 +484,10 @@ 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:
+               PBLOCK_ASSERT_OP( pb, 0 );
+               *((int *)value) = get_manageDIT( pb->pb_op );
+               break;
        case SLAPI_BACKEND:
                PBLOCK_ASSERT_OP( pb, 0 );
                *((BackendDB **)value) = pb->pb_op->o_bd;
@@ -592,7 +607,7 @@ pblock_get( Slapi_PBlock *pb, int param, void **value )
                                rc = PBLOCK_ERROR;
                                break;
                        }
-                       mods = slapi_int_modifications2ldapmods( &pb->pb_op->orm_modlist, NULL );
+                       mods = slapi_int_modifications2ldapmods( &pb->pb_op->orm_modlist );
                        pblock_set_default( pb, param, (void *)mods );
                }
                *((LDAPMod ***)value) = mods;
@@ -674,7 +689,8 @@ pblock_get( Slapi_PBlock *pb, int param, void **value )
                        attrs = anlist2charray_x( pb->pb_op->ors_attrs, 0, pb->pb_op->o_tmpmemctx );
                        pblock_set_default( pb, param, (void *)attrs );
                }
-               *((char ***)attrs) = attrs;
+               *((char ***)value) = attrs;
+               break;
        }
        case SLAPI_SEARCH_ATTRSONLY:
                PBLOCK_ASSERT_OP( pb, 0 );
@@ -783,7 +799,7 @@ pblock_set_dn( void *value, struct berval *dn, struct berval *ndn, void *memctx
        }
 
        bv.bv_val = (char *)value;
-       bv.bv_len = strlen( bv.bv_val );
+       bv.bv_len = ( value != NULL ) ? strlen( bv.bv_val ) : 0;
 
        return dnPrettyNormal( NULL, &bv, dn, ndn, memctx );
 }
@@ -811,6 +827,14 @@ pblock_set( Slapi_PBlock *pb, int param, void *value )
                PBLOCK_ASSERT_OP( pb, 0 );
                pb->pb_op->o_tag = *((ber_tag_t *)value);
                break;
+       case SLAPI_X_OPERATION_DELETE_GLUE_PARENT:
+               PBLOCK_ASSERT_OP( pb, 0 );
+               pb->pb_op->o_delete_glue_parent = *((int *)value);
+               break;
+       case SLAPI_X_OPERATION_NO_SCHEMA_CHECK:
+               PBLOCK_ASSERT_OP( pb, 0 );
+               pb->pb_op->o_no_schema_check = *((int *)value);
+               break;
        case SLAPI_REQCONTROLS:
                PBLOCK_ASSERT_OP( pb, 0 );
                pb->pb_op->o_ctrls = (LDAPControl **)value;
@@ -838,6 +862,10 @@ 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:
+               PBLOCK_ASSERT_OP( pb, 0 );
+               pb->pb_op->o_managedit = *((int *)value);
+               break;
        case SLAPI_BACKEND:
                PBLOCK_ASSERT_OP( pb, 0 );
                pb->pb_op->o_bd = (BackendDB *)value;
@@ -896,6 +924,7 @@ pblock_set( Slapi_PBlock *pb, int param, void *value )
                break;
        case SLAPI_MODIFY_MODS: {
                Modifications **mlp;
+               Modifications *newmods;
 
                PBLOCK_ASSERT_OP( pb, 0 );
                rc = pblock_set_default( pb, param, value );
@@ -911,18 +940,11 @@ pblock_set( Slapi_PBlock *pb, int param, void *value )
                        break;
                }
 
-               if ( *mlp != NULL ) {
-                       slapi_int_mods_free( *mlp );
-                       *mlp = NULL;
+               newmods = slapi_int_ldapmods2modifications( (LDAPMod **)value );
+               if ( newmods != NULL ) {
+                       slap_mods_free( *mlp, 1 );
+                       *mlp = newmods;
                }
-               /*
-                * Note: for internal operations, the modifications need to be
-                * duplicated because slap_mods_check() will free values before
-                * prettying, and we have no idea how the values were
-                * allocated. For frontend operations, slap_mods_check() will
-                * have already been called.    
-                */
-               *mlp = slapi_int_ldapmods2modifications( (LDAPMod **)value, pb->pb_intop, NULL );
                break;
        }
        case SLAPI_MODRDN_NEWRDN:
@@ -1268,7 +1290,7 @@ pblock_destroy( Slapi_PBlock *pb )
                slapi_int_connection_done_pb( pb );
        } else {
                pblock_get_default( pb, SLAPI_MODIFY_MODS, (void **)&mods );
-               slapi_int_free_ldapmods( mods );
+               ldap_mods_free( mods, 1 );
 
                pblock_get_default( pb, SLAPI_SEARCH_ATTRS, (void **)&attrs );
                if ( attrs != NULL )