/* $OpenLDAP$ */
/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/*
#include "ldap_pvt.h"
#include "slap.h"
+#ifdef LDAP_SLAPI
+#include "slapi.h"
+#endif
int
do_modrdn(
const char *text;
int manageDSAit;
+#ifdef LDAP_SLAPI
+ Slapi_PBlock *pb = op->o_pb;
+#endif
+
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ENTRY, "do_modrdn: begin\n", 0, 0, 0 );
#else
NULL, "cannot rename the root DSE", NULL, NULL );
goto cleanup;
-#ifdef SLAPD_SCHEMA_DN
} else if ( bvmatch( &ndn, &global_schemandn ) ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ERR,
send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
NULL, "cannot rename subschema subentry", NULL, NULL );
goto cleanup;
-#endif
}
/* FIXME: should have/use rdnPretty / rdnNormalize routines */
goto cleanup;
}
-
- /* deref suffix alias if appropriate */
- suffix_alias( be, &nnewSuperior );
}
- /* deref suffix alias if appropriate */
- suffix_alias( be, &ndn );
+#if defined( LDAP_SLAPI )
+ slapi_x_backend_set_pb( pb, be );
+ slapi_x_connection_set_pb( pb, conn );
+ slapi_x_operation_set_pb( pb, op );
+ slapi_pblock_set( pb, SLAPI_MODRDN_TARGET, (void *)dn.bv_val );
+ slapi_pblock_set( pb, SLAPI_MODRDN_NEWRDN, (void *)newrdn.bv_val );
+ slapi_pblock_set( pb, SLAPI_MODRDN_NEWSUPERIOR,
+ (void *)newSuperior.bv_val );
+ slapi_pblock_set( pb, SLAPI_MODRDN_DELOLDRDN, (void *)deloldrdn );
+ slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)manageDSAit );
+
+ rc = doPluginFNs( be, SLAPI_PLUGIN_PRE_MODRDN_FN, pb );
+ if ( rc != 0 ) {
+ /*
+ * A preoperation plugin failure will abort the
+ * entire operation.
+ */
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, INFO, "do_modrdn: modrdn preoperation plugin "
+ "failed\n", 0, 0, 0 );
+#else
+ Debug(LDAP_DEBUG_TRACE, "do_modrdn: modrdn preoperation plugin "
+ "failed.\n", 0, 0, 0);
+#endif
+ if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0)
+ rc = LDAP_OTHER;
+ goto cleanup;
+ }
+#endif /* defined( LDAP_SLAPI ) */
/*
* do the add if 1 && (2 || 3)
NULL, NULL );
}
+#if defined( LDAP_SLAPI )
+ if ( doPluginFNs( be, SLAPI_PLUGIN_POST_MODRDN_FN, pb ) != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, INFO, "do_modrdn: modrdn postoperation plugins "
+ "failed\n", 0, 0, 0 );
+#else
+ Debug(LDAP_DEBUG_TRACE, "do_modrdn: modrdn postoperation plugins "
+ "failed.\n", 0, 0, 0);
+#endif
+ }
+#endif /* defined( LDAP_SLAPI ) */
+
cleanup:
free( pdn.bv_val );
free( ndn.bv_val );
Modifications *mod = NULL;
int a_cnt, d_cnt;
+ assert( new_rdn != NULL );
+ assert( !deleteoldrdn || old_rdn != NULL );
+
/* Add new attribute values to the entry */
- for ( a_cnt = 0; new_rdn[ 0 ][ a_cnt ]; a_cnt++ ) {
+ for ( a_cnt = 0; new_rdn[0][a_cnt]; a_cnt++ ) {
AttributeDescription *desc = NULL;
Modifications *mod_tmp;
- rc = slap_bv2ad( &new_rdn[ 0 ][ a_cnt ]->la_attr,
- &desc, &text );
+ rc = slap_bv2ad( &new_rdn[0][a_cnt]->la_attr, &desc, &text );
if ( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
/* ACL check of newly added attrs */
if ( be && !access_allowed( be, conn, op, e, desc,
- &new_rdn[ 0 ][ a_cnt ]->la_value, ACL_WRITE, NULL ) ) {
+ &new_rdn[0][a_cnt]->la_value, ACL_WRITE, NULL ) ) {
#ifdef NEW_LOGGING
LDAP_LOG ( OPERATION, ERR,
"slap_modrdn2modlist: access to attr \"%s\" "
"(new) not allowed\n",
- new_rdn[ 0 ][a_cnt]->la_attr.bv_val, 0, 0 );
+ new_rdn[0][a_cnt]->la_attr.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"slap_modrdn2modlist: access to attr \"%s\" "
"(new) not allowed\n",
- new_rdn[ 0 ][ a_cnt ]->la_attr.bv_val, 0, 0 );
+ new_rdn[0][ a_cnt ]->la_attr.bv_val, 0, 0 );
#endif
rc = LDAP_INSUFFICIENT_ACCESS;
goto done;
}
/* Apply modification */
+#ifdef SLAP_NVALUES
+ mod_tmp = ( Modifications * )ch_malloc( sizeof( Modifications )
+ + 4 * sizeof( struct berval ) );
+#else
mod_tmp = ( Modifications * )ch_malloc( sizeof( Modifications )
+ 2 * sizeof( struct berval ) );
+#endif
mod_tmp->sml_desc = desc;
- mod_tmp->sml_bvalues = ( BerVarray )( mod_tmp + 1 );
- mod_tmp->sml_bvalues[ 0 ] = new_rdn[ 0 ][ a_cnt ]->la_value;
- mod_tmp->sml_bvalues[ 1 ].bv_val = NULL;
+ mod_tmp->sml_values = ( BerVarray )( mod_tmp + 1 );
+ mod_tmp->sml_values[0] = new_rdn[0][a_cnt]->la_value;
+ mod_tmp->sml_values[1].bv_val = NULL;
+#ifdef SLAP_NVALUES
+ if( desc->ad_type->sat_equality->smr_normalize) {
+ mod_tmp->sml_nvalues = &mod_tmp->sml_values[2];
+ (void) (*desc->ad_type->sat_equality->smr_normalize)(
+ SLAP_MR_EQUALITY,
+ desc->ad_type->sat_syntax,
+ desc->ad_type->sat_equality,
+ &mod_tmp->sml_values[0],
+ &mod_tmp->sml_nvalues[0] );
+ mod_tmp->sml_nvalues[1].bv_val = NULL;
+ } else {
+ mod_tmp->sml_nvalues = NULL;
+ }
+#endif
mod_tmp->sml_op = SLAP_MOD_SOFTADD;
mod_tmp->sml_next = mod;
mod = mod_tmp;
/* Remove old rdn value if required */
if ( deleteoldrdn ) {
- for ( d_cnt = 0; old_rdn[ 0 ][ d_cnt ]; d_cnt++ ) {
+ for ( d_cnt = 0; old_rdn[0][d_cnt]; d_cnt++ ) {
AttributeDescription *desc = NULL;
Modifications *mod_tmp;
- rc = slap_bv2ad( &old_rdn[ 0 ][ d_cnt ]->la_attr,
- &desc, &text );
-
+ rc = slap_bv2ad( &old_rdn[0][d_cnt]->la_attr, &desc, &text );
if ( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG ( OPERATION, ERR,
"slap_modrdn2modlist: %s: %s (old)\n",
text,
- old_rdn[ 0 ][ d_cnt ]->la_attr.bv_val,
+ old_rdn[0][d_cnt]->la_attr.bv_val,
0 );
#else
Debug( LDAP_DEBUG_TRACE,
"slap_modrdn2modlist: %s: %s (old)\n",
text,
- old_rdn[ 0 ][ d_cnt ]->la_attr.bv_val,
+ old_rdn[0][d_cnt]->la_attr.bv_val,
0 );
#endif
goto done;
/* ACL check of newly added attrs */
if ( be && !access_allowed( be, conn, op, e, desc,
- &old_rdn[ 0 ][ d_cnt ]->la_value, ACL_WRITE,
+ &old_rdn[0][d_cnt]->la_value, ACL_WRITE,
NULL ) ) {
#ifdef NEW_LOGGING
LDAP_LOG ( OPERATION, ERR,
}
/* Apply modification */
+#ifdef SLAP_NVALUES
+ mod_tmp = ( Modifications * )ch_malloc( sizeof( Modifications )
+ + 2 * sizeof ( struct berval ) );
+#else
mod_tmp = ( Modifications * )ch_malloc( sizeof( Modifications )
+ 2 * sizeof ( struct berval ) );
+#endif
mod_tmp->sml_desc = desc;
- mod_tmp->sml_bvalues = ( BerVarray )(mod_tmp+1);
- mod_tmp->sml_bvalues[ 0 ]
- = old_rdn[ 0 ][ d_cnt ]->la_value;
- mod_tmp->sml_bvalues[ 1 ].bv_val = NULL;
+ mod_tmp->sml_values = ( BerVarray )(mod_tmp+1);
+ mod_tmp->sml_values[0] = old_rdn[0][d_cnt]->la_value;
+ mod_tmp->sml_values[1].bv_val = NULL;
+#ifdef SLAP_NVALUES
+ if( desc->ad_type->sat_equality->smr_normalize) {
+ mod_tmp->sml_nvalues = &mod_tmp->sml_values[2];
+ (void) (*desc->ad_type->sat_equality->smr_normalize)(
+ SLAP_MR_EQUALITY,
+ desc->ad_type->sat_syntax,
+ desc->ad_type->sat_equality,
+ &mod_tmp->sml_values[0],
+ &mod_tmp->sml_nvalues[0] );
+ mod_tmp->sml_nvalues[1].bv_val = NULL;
+ } else {
+ mod_tmp->sml_nvalues = NULL;
+ }
+#endif
mod_tmp->sml_op = LDAP_MOD_DELETE;
mod_tmp->sml_next = mod;
mod = mod_tmp;
projects / openldap / blobdiff