/* $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
*/
/*
Operation *op
)
{
- char *dn, *ndn = NULL, *newrdn;
+ struct berval dn = { 0, NULL };
+ struct berval newrdn = { 0, NULL };
+ struct berval newSuperior = { 0, NULL };
ber_int_t deloldrdn;
+
+ struct berval pdn = { 0, NULL };
+ struct berval pnewrdn = { 0, NULL };
+ struct berval pnewSuperior = { 0, NULL }, *pnewS = NULL;
+
+ struct berval ndn = { 0, NULL };
+ struct berval nnewrdn = { 0, NULL };
+ struct berval nnewSuperior = { 0, NULL }, *nnewS = NULL;
+
Backend *be;
- /* Vars for LDAP v3 newSuperior support */
- char *newSuperior = NULL;
- char *nnewSuperior = NULL;
Backend *newSuperior_be = NULL;
ber_len_t length;
int rc;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
- "do_modrdn: begin\n" ));
+ "do_modrdn: begin\n" ));
#else
Debug( LDAP_DEBUG_TRACE, "do_modrdn\n", 0, 0, 0 );
#endif
* }
*/
- if ( ber_scanf( op->o_ber, "{aab", &dn, &newrdn, &deloldrdn )
- == LBER_ERROR ) {
+ if ( ber_scanf( op->o_ber, "{mmb", &dn, &newrdn, &deloldrdn )
+ == LBER_ERROR )
+ {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "do_modrdn: ber_scanf failed\n" ));
+ "do_modrdn: ber_scanf failed\n" ));
#else
Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
#endif
*/
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "do_modrdn: (v2) invalid field newSuperior.\n" ));
+ "do_modrdn: (v2) invalid field newSuperior.\n" ));
#else
Debug( LDAP_DEBUG_ANY,
- "modrdn(v2): invalid field newSuperior!\n",
- 0, 0, 0 );
+ "modrdn(v2): invalid field newSuperior!\n",
+ 0, 0, 0 );
#endif
send_ldap_disconnect( conn, op,
goto cleanup;
}
- if ( ber_scanf( op->o_ber, "a", &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",
- 0, 0, 0 );
+ Debug( LDAP_DEBUG_ANY, "ber_scanf(\"m\") failed\n",
+ 0, 0, 0 );
#endif
send_ldap_disconnect( conn, op,
rc = SLAPD_DISCONNECT;
goto cleanup;
}
-
- nnewSuperior = ch_strdup( newSuperior );
-
- if( dn_normalize( nnewSuperior ) == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "do_modrdn: invalid new superior (%s)\n", newSuperior ));
-#else
- Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid new superior (%s)\n",
- newSuperior, 0, 0 );
-#endif
-
- send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
- "invalid new superior DN", NULL, NULL );
- goto cleanup;
- }
-
+ pnewS = &pnewSuperior;
+ nnewS = &nnewSuperior;
}
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
- "do_modrdn: dn (%s) newrdn (%s) newsuperior(%s)\n",
- dn, newrdn, newSuperior != NULL ? newSuperior : "" ));
+ "do_modrdn: dn (%s) newrdn (%s) newsuperior(%s)\n",
+ dn.bv_val, newrdn.bv_val,
+ newSuperior.bv_len ? newSuperior.bv_val : "" ));
#else
Debug( LDAP_DEBUG_ARGS,
"do_modrdn: dn (%s) newrdn (%s) newsuperior (%s)\n",
- dn, newrdn,
- newSuperior != NULL ? newSuperior : "" );
+ dn.bv_val, newrdn.bv_val,
+ newSuperior.bv_len ? newSuperior.bv_val : "" );
#endif
-
if ( ber_scanf( op->o_ber, /*{*/ "}") == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "do_modrdn: ber_scanf failed\n" ));
+ "do_modrdn: ber_scanf failed\n" ));
#else
Debug( LDAP_DEBUG_ANY, "do_modrdn: ber_scanf failed\n", 0, 0, 0 );
#endif
send_ldap_disconnect( conn, op,
- LDAP_PROTOCOL_ERROR, "decoding error" );
+ LDAP_PROTOCOL_ERROR, "decoding error" );
rc = SLAPD_DISCONNECT;
goto cleanup;
}
if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "do_modrdn: get_ctrls failed\n" ));
+ "do_modrdn: get_ctrls failed\n" ));
#else
Debug( LDAP_DEBUG_ANY, "do_modrdn: get_ctrls failed\n", 0, 0, 0 );
#endif
goto cleanup;
}
- ndn = ch_strdup( dn );
-
- if( dn_normalize( ndn ) == NULL ) {
+ rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn );
+ if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "do_modrdn: invalid dn (%s)\n", dn ));
+ LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+ "do_modrdn: conn %d invalid dn (%s)\n",
+ conn->c_connid, dn.bv_val ));
#else
- Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid dn (%s)\n", dn, 0, 0 );
+ Debug( LDAP_DEBUG_ANY,
+ "do_modrdn: invalid dn (%s)\n", dn.bv_val, 0, 0 );
#endif
-
send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
"invalid DN", NULL, NULL );
goto cleanup;
}
- if( !rdn_validate( newrdn ) ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "do_modrdn: invalid rdn (%s).\n", newrdn ));
-#else
- Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid rdn (%s)\n", newrdn, 0, 0 );
-#endif
-
- send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
- "invalid RDN", NULL, NULL );
- goto cleanup;
- }
-
- if( *ndn == '\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, 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" ));
#endif
}
+ /* FIXME: should have/use rdnPretty / rdnNormalize routines */
+
+ rc = dnPrettyNormal( NULL, &newrdn, &pnewrdn, &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, newrdn.bv_val ));
+#else
+ Debug( LDAP_DEBUG_ANY,
+ "do_modrdn: invalid newrdn (%s)\n", newrdn.bv_val, 0, 0 );
+#endif
+ send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
+ "invalid new RDN", NULL, NULL );
+ goto cleanup;
+ }
+
+ if( rdnValidate( &pnewrdn ) != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "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 );
+#endif
+
+ send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
+ "invalid new RDN", NULL, NULL );
+ goto cleanup;
+ }
+
+ if( pnewS ) {
+ rc = dnPrettyNormal( NULL, &newSuperior, &pnewSuperior,
+ &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, newSuperior.bv_val ));
+#else
+ 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;
+ }
+ }
+
Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d MODRDN dn=\"%s\"\n",
- op->o_connid, op->o_opid, dn, 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, 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, dn, ndn );
+ 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 != NULL ) {
- 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 */
- nnewSuperior = suffix_alias( be, nnewSuperior );
+ suffix_alias( be, &nnewSuperior );
}
/* deref suffix alias if appropriate */
- ndn = suffix_alias( be, ndn );
+ suffix_alias( be, &ndn );
/*
* do the add if 1 && (2 || 3)
*/
if ( be->be_modrdn ) {
/* do the update here */
- int repl_user = be_isupdate( be, op->o_ndn );
+ int repl_user = be_isupdate( be, &op->o_ndn );
#ifndef SLAPD_MULTIMASTER
- if ( be->be_update_ndn == NULL || repl_user )
+ if ( !be->be_update_ndn.bv_len || repl_user )
#endif
{
- if ( (*be->be_modrdn)( be, conn, op, dn, ndn, newrdn,
- deloldrdn, newSuperior ) == 0
+ if ( (*be->be_modrdn)( be, conn, op, &pdn, &ndn,
+ &pnewrdn, &nnewrdn, deloldrdn,
+ pnewS, nnewS ) == 0
#ifdef SLAPD_MULTIMASTER
- && ( be->be_update_ndn == NULL || !repl_user )
+ && ( !be->be_update_ndn.bv_len || !repl_user )
#endif
) {
- struct replog_moddn moddn;
- moddn.newrdn = newrdn;
+ struct slap_replog_moddn moddn;
+ moddn.newrdn = &pnewrdn;
moddn.deloldrdn = deloldrdn;
- moddn.newsup = newSuperior;
+ moddn.newsup = &pnewSuperior;
- replog( be, op, dn, 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, dn, 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 {
send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
- NULL, "operation not supported within namingContext", NULL, NULL );
+ NULL, "operation not supported within namingContext",
+ NULL, NULL );
}
cleanup:
- free( dn );
- if( ndn != NULL ) free( ndn );
- free( newrdn );
- if ( newSuperior != NULL )
- free( newSuperior );
- if ( nnewSuperior != NULL )
- free( nnewSuperior );
+ free( pdn.bv_val );
+ free( ndn.bv_val );
+
+ free( pnewrdn.bv_val );
+ free( nnewrdn.bv_val );
+
+ if ( pnewSuperior.bv_val ) free( pnewSuperior.bv_val );
+ if ( nnewSuperior.bv_val ) free( nnewSuperior.bv_val );
+
return rc;
}
projects / openldap / blobdiff