/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/*
struct berval pdn = { 0, NULL };
struct berval pnewrdn = { 0, NULL };
- struct berval pnewSuperior = { 0, NULL };
+ struct berval pnewSuperior = { 0, NULL }, *pnewS = NULL;
struct berval ndn = { 0, NULL };
struct berval nnewrdn = { 0, NULL };
- struct berval nnewSuperior = { 0, NULL };
+ struct berval nnewSuperior = { 0, NULL }, *nnewS = NULL;
Backend *be;
Backend *newSuperior_be = NULL;
* }
*/
- if ( ber_scanf( op->o_ber, "{oob", &dn, &newrdn, &deloldrdn )
+ if ( ber_scanf( op->o_ber, "{mmb", &dn, &newrdn, &deloldrdn )
== LBER_ERROR )
{
#ifdef NEW_LOGGING
goto cleanup;
}
- if ( ber_scanf( op->o_ber, "o", &newSuperior )
+ if ( ber_scanf( op->o_ber, "m", &newSuperior )
== LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "do_modrdn: ber_scanf(\"a\") failed\n" ));
+ "do_modrdn: ber_scanf(\"m\") failed\n" ));
#else
- Debug( LDAP_DEBUG_ANY, "ber_scanf(\"a\") failed\n",
+ Debug( LDAP_DEBUG_ANY, "ber_scanf(\"m\") failed\n",
0, 0, 0 );
#endif
rc = SLAPD_DISCONNECT;
goto cleanup;
}
+ pnewS = &pnewSuperior;
+ nnewS = &nnewSuperior;
}
#ifdef NEW_LOGGING
goto cleanup;
}
- if( newSuperior.bv_len ) {
+ if( pnewS ) {
rc = dnPrettyNormal( NULL, &newSuperior, &pnewSuperior,
&nnewSuperior );
if( rc != LDAP_SUCCESS ) {
* if we don't hold it.
*/
if ( (be = select_backend( &ndn, manageDSAit, 0 )) == NULL ) {
- struct berval **ref = referral_rewrite( default_referral,
+ BerVarray ref = referral_rewrite( default_referral,
NULL, &pdn, LDAP_SCOPE_DEFAULT );
send_ldap_result( conn, op, rc = LDAP_REFERRAL,
NULL, NULL, ref ? ref : default_referral, NULL );
- ber_bvecfree( ref );
+ ber_bvarray_free( ref );
goto cleanup;
}
/* Make sure that the entry being changed and the newSuperior are in
* the same backend, otherwise we return an error.
*/
- if( newSuperior.bv_len ) {
+ if( pnewS ) {
newSuperior_be = select_backend( &nnewSuperior, 0, 0 );
if ( newSuperior_be != be ) {
{
if ( (*be->be_modrdn)( be, conn, op, &pdn, &ndn,
&pnewrdn, &nnewrdn, deloldrdn,
- &pnewSuperior, &nnewSuperior ) == 0
+ pnewS, nnewS ) == 0
#ifdef SLAPD_MULTIMASTER
&& ( !be->be_update_ndn.bv_len || !repl_user )
#endif
}
#ifndef SLAPD_MULTIMASTER
} else {
- struct berval **defref = be->be_update_refs
+ BerVarray defref = be->be_update_refs
? be->be_update_refs : default_referral;
- struct berval **ref = referral_rewrite( defref,
+ BerVarray ref = referral_rewrite( defref,
NULL, &pdn, LDAP_SCOPE_DEFAULT );
send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL,
ref ? ref : defref, NULL );
- ber_bvecfree( ref );
+ ber_bvarray_free( ref );
#endif
}
} else {
}
cleanup:
- free( dn.bv_val );
free( pdn.bv_val );
free( ndn.bv_val );
- free( newrdn.bv_val );
free( pnewrdn.bv_val );
free( nnewrdn.bv_val );
- free( newSuperior.bv_val );
- free( pnewSuperior.bv_val );
- free( nnewSuperior.bv_val );
+ if ( pnewSuperior.bv_val ) free( pnewSuperior.bv_val );
+ if ( nnewSuperior.bv_val ) free( nnewSuperior.bv_val );
return rc;
}