/* $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 newSuperior = { 0, NULL };
ber_int_t deloldrdn;
- struct berval *pdn = NULL;
- struct berval *pnewrdn = NULL;
- struct berval *pnewSuperior = NULL;
+ struct berval pdn = { 0, NULL };
+ struct berval pnewrdn = { 0, NULL };
+ struct berval pnewSuperior = { 0, NULL }, *pnewS = NULL;
- struct berval *ndn = NULL;
- struct berval *nnewrdn = NULL;
- struct berval *nnewSuperior = NULL;
+ struct berval ndn = { 0, NULL };
+ struct berval nnewrdn = { 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;
}
- rc = dnPretty( NULL, &dn, &pdn );
+ rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn );
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
goto cleanup;
}
- rc = dnNormalize( NULL, &dn, &ndn );
- if( rc != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
- "do_modrdn: conn %d invalid dn (%s)\n",
- conn->c_connid, pdn->bv_val ));
-#else
- Debug( LDAP_DEBUG_ANY,
- "do_modrdn: invalid dn (%s)\n", pdn->bv_val, 0, 0 );
-#endif
- send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
- "invalid DN", NULL, NULL );
- goto cleanup;
- }
-
- if( ndn->bv_len == 0 ) {
+ if( ndn.bv_len == 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modrdn: attempt to modify root DSE.\n" ));
goto cleanup;
#ifdef SLAPD_SCHEMA_DN
- } else if ( strcasecmp( ndn->bv_val, SLAPD_SCHEMA_DN ) == 0 ) {
+ } else if ( strcasecmp( ndn.bv_val, SLAPD_SCHEMA_DN ) == 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modrdn: attempt to modify subschema subentry\n" ));
/* FIXME: should have/use rdnPretty / rdnNormalize routines */
- rc = dnPretty( NULL, &newrdn, &pnewrdn );
+ rc = dnPrettyNormal( NULL, &newrdn, &pnewrdn, &nnewrdn );
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
goto cleanup;
}
- rc = dnNormalize( NULL, &newrdn, &nnewrdn );
- if( rc != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
- "do_modrdn: conn %d invalid newrdn (%s)\n",
- conn->c_connid, pnewrdn->bv_val ));
-#else
- Debug( LDAP_DEBUG_ANY,
- "do_modrdn: invalid newrdn (%s)\n", pnewrdn->bv_val, 0, 0 );
-#endif
- send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
- "invalid new RDN", NULL, NULL );
- goto cleanup;
- }
-
- if( !nnewrdn->bv_len || !rdn_validate( pnewrdn->bv_val ) ) {
+ if( rdnValidate( &pnewrdn ) != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "do_modrdn: invalid rdn (%s).\n", pnewrdn->bv_val ));
+ "do_modrdn: invalid rdn (%s).\n", pnewrdn.bv_val ));
#else
Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid rdn (%s)\n",
- pnewrdn->bv_val, 0, 0 );
+ pnewrdn.bv_val, 0, 0 );
#endif
send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
goto cleanup;
}
- if( newSuperior.bv_len ) {
- rc = dnPretty( NULL, &newSuperior, &pnewSuperior );
+ if( pnewS ) {
+ rc = dnPrettyNormal( NULL, &newSuperior, &pnewSuperior,
+ &nnewSuperior );
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
Debug( LDAP_DEBUG_ANY,
"do_modrdn: invalid newSuperior (%s)\n",
newSuperior.bv_val, 0, 0 );
-#endif
- send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
- "invalid newSuperior", NULL, NULL );
- goto cleanup;
- }
-
- rc = dnNormalize( NULL, &newSuperior, &nnewSuperior );
- if( rc != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
- "do_modrdn: conn %d invalid newSuperior (%s)\n",
- conn->c_connid, pnewSuperior->bv_val ));
-#else
- Debug( LDAP_DEBUG_ANY,
- "do_modrdn: invalid newSuperior (%s)\n",
- pnewSuperior->bv_val, 0, 0 );
#endif
send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
"invalid newSuperior", NULL, NULL );
}
Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d MODRDN dn=\"%s\"\n",
- op->o_connid, op->o_opid, pdn->bv_val, 0, 0 );
+ op->o_connid, op->o_opid, pdn.bv_val, 0, 0 );
manageDSAit = get_manageDSAit( op );
* appropriate one, or send a referral to our "referral server"
* if we don't hold it.
*/
- if ( (be = select_backend( ndn, manageDSAit, 0 )) == NULL ) {
- struct berval **ref = referral_rewrite( default_referral,
- NULL, dn.bv_val, LDAP_SCOPE_DEFAULT );
+ if ( (be = select_backend( &ndn, manageDSAit, 0 )) == NULL ) {
+ BVarray 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 );
+ bvarray_free( ref );
goto cleanup;
}
}
/* check for referrals */
- rc = backend_check_referrals( be, conn, op, pdn->bv_val, ndn->bv_val );
+ rc = backend_check_referrals( be, conn, op, &pdn, &ndn );
if ( rc != LDAP_SUCCESS ) {
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 ) {
- newSuperior_be = select_backend( nnewSuperior, 0, 0 );
+ if( pnewS ) {
+ newSuperior_be = select_backend( &nnewSuperior, 0, 0 );
if ( newSuperior_be != be ) {
/* newSuperior is in same backend */
}
/* deref suffix alias if appropriate */
- suffix_alias( be, nnewSuperior );
+ suffix_alias( be, &nnewSuperior );
}
/* deref suffix alias if appropriate */
- suffix_alias( be, ndn );
+ suffix_alias( be, &ndn );
/*
* do the add if 1 && (2 || 3)
if ( !be->be_update_ndn.bv_len || repl_user )
#endif
{
- if ( (*be->be_modrdn)( be, conn, op, pdn->bv_val, ndn->bv_val,
- pnewrdn->bv_val, deloldrdn,
- pnewSuperior ? pnewSuperior->bv_val : NULL ) == 0
+ if ( (*be->be_modrdn)( be, conn, op, &pdn, &ndn,
+ &pnewrdn, &nnewrdn, deloldrdn,
+ pnewS, nnewS ) == 0
#ifdef SLAPD_MULTIMASTER
&& ( !be->be_update_ndn.bv_len || !repl_user )
#endif
) {
struct slap_replog_moddn moddn;
- moddn.newrdn = pnewrdn;
+ moddn.newrdn = &pnewrdn;
moddn.deloldrdn = deloldrdn;
- moddn.newsup = pnewSuperior;
+ moddn.newsup = &pnewSuperior;
- replog( be, op, pdn, ndn, &moddn );
+ replog( be, op, &pdn, &ndn, &moddn );
}
#ifndef SLAPD_MULTIMASTER
} else {
- struct berval **defref = be->be_update_refs
+ BVarray defref = be->be_update_refs
? be->be_update_refs : default_referral;
- struct berval **ref = referral_rewrite( defref,
- NULL, pdn->bv_val, LDAP_SCOPE_DEFAULT );
+ BVarray 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 );
+ bvarray_free( ref );
#endif
}
} else {
}
cleanup:
- free( dn.bv_val );
- if( pdn != NULL ) ber_bvfree( pdn );
- if( ndn != NULL ) ber_bvfree( ndn );
+ free( pdn.bv_val );
+ free( ndn.bv_val );
- free( newrdn.bv_val );
- if( pnewrdn != NULL ) ber_bvfree( pnewrdn );
- if( nnewrdn != NULL ) ber_bvfree( nnewrdn );
+ free( pnewrdn.bv_val );
+ free( nnewrdn.bv_val );
- free( newSuperior.bv_val );
- if ( pnewSuperior != NULL ) ber_bvfree( pnewSuperior );
- if ( nnewSuperior != NULL ) ber_bvfree( nnewSuperior );
+ if ( pnewSuperior.bv_val ) free( pnewSuperior.bv_val );
+ if ( nnewSuperior.bv_val ) free( nnewSuperior.bv_val );
return rc;
}
projects / openldap / blobdiff