X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmodrdn.c;h=60889b7a543cbe6a4b70f9363233a9e7925c42e5;hb=f8fb4aca7668c722f41941be719203aa8c298e12;hp=20c5249f898fe41ef15784692750a3761a1ecb2d;hpb=76a94de25197b88f8599cea2ff73962926b07614;p=openldap diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c index 20c5249f89..60889b7a54 100644 --- a/servers/slapd/modrdn.c +++ b/servers/slapd/modrdn.c @@ -1,5 +1,6 @@ +/* $OpenLDAP$ */ /* - * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* @@ -34,6 +35,7 @@ #include #include +#include "ldap_pvt.h" #include "slap.h" int @@ -42,25 +44,33 @@ do_modrdn( Operation *op ) { - char *ndn, *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; + const char *text; + int manageDSAit; +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, + "do_modrdn: begin\n" )); +#else Debug( LDAP_DEBUG_TRACE, "do_modrdn\n", 0, 0, 0 ); +#endif - if( op->o_bind_in_progress ) { - Debug( LDAP_DEBUG_ANY, "do_modrdn: SASL bind in progress.\n", - 0, 0, 0 ); - send_ldap_result( conn, op, LDAP_SASL_BIND_IN_PROGRESS, - NULL, "SASL bind in progress", NULL, NULL ); - return LDAP_SASL_BIND_IN_PROGRESS; - } /* * Parse the modrdn request. It looks like this: @@ -73,30 +83,19 @@ do_modrdn( * } */ - if ( ber_scanf( op->o_ber, "{aab", &ndn, &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" )); +#else Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 ); +#endif + send_ldap_disconnect( conn, op, LDAP_PROTOCOL_ERROR, "decoding error" ); - return -1; - } - - if( dn_normalize_case( ndn ) == NULL ) { - Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid dn (%s)\n", ndn, 0, 0 ); - send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL, - "invalid DN", NULL, NULL ); - free( ndn ); - free( newrdn ); - return rc; - } - - if( !rdn_validate( newrdn ) ) { - Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid rdn (%s)\n", newrdn, 0, 0 ); - send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL, - "invalid RDN", NULL, NULL ); - free( ndn ); - free( newrdn ); - return rc; + return SLAPD_DISCONNECT; } /* Check for newSuperior parameter, if present scan it */ @@ -106,116 +105,228 @@ do_modrdn( /* Conection record indicates v2 but field * newSuperior is present: report error. */ +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_ERR, + "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, LDAP_PROTOCOL_ERROR, "newSuperior requires LDAPv3" ); - return -1; + rc = SLAPD_DISCONNECT; + goto cleanup; } - if ( ber_scanf( op->o_ber, "a", &newSuperior ) + if ( ber_scanf( op->o_ber, "m", &newSuperior ) == LBER_ERROR ) { - Debug( LDAP_DEBUG_ANY, "ber_scanf(\"a\"}) failed\n", - 0, 0, 0 ); +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_ERR, + "do_modrdn: ber_scanf(\"m\") failed\n" )); +#else + Debug( LDAP_DEBUG_ANY, "ber_scanf(\"m\") failed\n", + 0, 0, 0 ); +#endif + send_ldap_disconnect( conn, op, LDAP_PROTOCOL_ERROR, "decoding error" ); - return -1; + rc = SLAPD_DISCONNECT; + goto cleanup; } - - nnewSuperior = ch_strdup( newSuperior ); - - if( dn_normalize_case( nnewSuperior ) == NULL ) { - Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid new superior (%s)\n", - newSuperior, 0, 0 ); - send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL, - "invalid (new superior) DN", NULL, NULL ); - free( ndn ); - free( newrdn ); - return rc; - } - + pnewS = &pnewSuperior; + nnewS = &nnewSuperior; } +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_ARGS, + "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", - ndn, 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 ) { - free( ndn ); - free( newrdn ); - free( newSuperior ); - free( nnewSuperior ); +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_ERR, + "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" ); - return -1; + LDAP_PROTOCOL_ERROR, "decoding error" ); + rc = SLAPD_DISCONNECT; + goto cleanup; } if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) { - free( ndn ); - free( newrdn ); - free( newSuperior ); +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_ERR, + "do_modrdn: get_ctrls failed\n" )); +#else Debug( LDAP_DEBUG_ANY, "do_modrdn: get_ctrls failed\n", 0, 0, 0 ); - return rc; +#endif + + /* get_ctrls has sent results. Now clean up. */ + goto cleanup; } + rc = dnPrettyNormal( NULL, &dn, &pdn, &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, dn.bv_val )); +#else + 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( ndn.bv_len == 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_ERR, + "do_modrdn: attempt to modify root DSE.\n" )); +#else + Debug( LDAP_DEBUG_ANY, "do_modrdn: root dse!\n", 0, 0, 0 ); +#endif + + send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, + NULL, "cannot rename the root DSE", NULL, NULL ); + goto cleanup; + +#ifdef SLAPD_SCHEMA_DN + } 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" )); +#else + Debug( LDAP_DEBUG_ANY, "do_modrdn: subschema subentry!\n", 0, 0, 0 ); +#endif + + 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 */ + + 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, ndn, 0, 0 ); + op->o_connid, op->o_opid, pdn.bv_val, 0, 0 ); + + manageDSAit = get_manageDSAit( op ); /* * We could be serving multiple database backends. Select the * appropriate one, or send a referral to our "referral server" * if we don't hold it. */ + if ( (be = select_backend( &ndn, manageDSAit, 0 )) == NULL ) { + BVarray ref = referral_rewrite( default_referral, + NULL, &pdn, LDAP_SCOPE_DEFAULT ); - if ( (be = select_backend( ndn )) == NULL ) { - free( ndn ); - free( newrdn ); - free( newSuperior ); - free( nnewSuperior ); send_ldap_result( conn, op, rc = LDAP_REFERRAL, - NULL, NULL, default_referral, NULL ); - return rc; + NULL, NULL, ref ? ref : default_referral, NULL ); + + bvarray_free( ref ); + goto cleanup; } - if ( global_readonly || be->be_readonly ) { - Debug( LDAP_DEBUG_ANY, "do_modrdn: database is read-only\n", - 0, 0, 0 ); - send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, - NULL, "database is read-only", NULL, NULL ); - goto done; + /* check restrictions */ + rc = backend_check_restrictions( be, conn, op, NULL, &text ) ; + if( rc != LDAP_SUCCESS ) { + send_ldap_result( conn, op, rc, + NULL, text, NULL, NULL ); + goto cleanup; + } + + /* check for referrals */ + 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 ); + if( pnewS ) { + newSuperior_be = select_backend( &nnewSuperior, 0, 0 ); if ( newSuperior_be != be ) { /* newSuperior is in same backend */ rc = LDAP_AFFECTS_MULTIPLE_DSAS; send_ldap_result( conn, op, rc, - NULL, NULL, NULL, NULL ); + NULL, "cannot rename between DSAa", NULL, NULL ); - free( ndn ); - free( newrdn ); - free( newSuperior ); - free( nnewSuperior ); - - return rc; + goto cleanup; } /* 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) @@ -225,40 +336,53 @@ do_modrdn( */ if ( be->be_modrdn ) { /* do the update here */ + int repl_user = be_isupdate( be, &op->o_ndn ); #ifndef SLAPD_MULTIMASTER - if ( be->be_update_ndn == NULL || - strcmp( be->be_update_ndn, op->o_ndn ) == 0 ) + if ( !be->be_update_ndn.bv_len || repl_user ) #endif { - if ( (*be->be_modrdn)( be, conn, op, 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 || - strcmp( be->be_update_ndn, op->o_ndn ) ) + && ( !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, ndn, &moddn ); + replog( be, op, &pdn, &ndn, &moddn ); } #ifndef SLAPD_MULTIMASTER } else { + BVarray defref = be->be_update_refs + ? be->be_update_refs : default_referral; + BVarray ref = referral_rewrite( defref, + NULL, &pdn, LDAP_SCOPE_DEFAULT ); + send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL, - be->be_update_refs ? be->be_update_refs : default_referral, NULL ); + ref ? ref : defref, NULL ); + + bvarray_free( ref ); #endif } } else { send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, - NULL, "Function not implemented", NULL, NULL ); + NULL, "operation not supported within namingContext", + NULL, NULL ); } -done: - free( ndn ); - free( newrdn ); - free( newSuperior ); - free( nnewSuperior ); +cleanup: + 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; }