X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmodrdn.c;h=c9171d709bb52e6d5ebd5d5003a64264095b8e40;hb=8da81d42c7b31191c175aa0a8a9439b66594f3c3;hp=0d71c39c981322a0cc07252878b2330f70ee2c93;hpb=320ab38e45de61de1441055b8e4ef5c0e492fab4;p=openldap
diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index 0d71c39c98..c9171d709b 100644
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -1,7 +1,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software .
*
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,6 @@
#include
#include
-#include "ldap_pvt.h"
#include "slap.h"
#ifdef LDAP_SLAPI
#include "slapi/slapi.h"
@@ -61,11 +60,7 @@ do_modrdn(
ber_len_t length;
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ENTRY, "do_modrdn: begin\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_TRACE, "do_modrdn\n", 0, 0, 0 );
-#endif
/*
@@ -82,11 +77,7 @@ do_modrdn(
if ( ber_scanf( op->o_ber, "{mmb", &dn, &newrdn, &deloldrdn )
== LBER_ERROR )
{
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR, "do_modrdn: ber_scanf failed\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
-#endif
send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
return SLAPD_DISCONNECT;
@@ -99,14 +90,9 @@ do_modrdn(
/* Conection record indicates v2 but field
* newSuperior is present: report error.
*/
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "do_modrdn: (v2) invalid field newSuperior.\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY,
"modrdn(v2): invalid field newSuperior!\n",
0, 0, 0 );
-#endif
send_ldap_discon( op, rs,
LDAP_PROTOCOL_ERROR, "newSuperior requires LDAPv3" );
@@ -117,13 +103,8 @@ do_modrdn(
if ( ber_scanf( op->o_ber, "m", &newSuperior )
== LBER_ERROR ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "do_modrdn: ber_scanf(\"m\") failed\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, "ber_scanf(\"m\") failed\n",
0, 0, 0 );
-#endif
send_ldap_discon( op, rs,
LDAP_PROTOCOL_ERROR, "decoding error" );
@@ -134,24 +115,13 @@ do_modrdn(
op->orr_nnewSup = &nnewSuperior;
}
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, 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",
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, ERR, "do_modrdn: ber_scanf failed\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, "do_modrdn: ber_scanf failed\n", 0, 0, 0 );
-#endif
send_ldap_discon( op, rs,
LDAP_PROTOCOL_ERROR, "decoding error" );
@@ -160,11 +130,7 @@ do_modrdn(
}
if( get_ctrls( op, rs, 1 ) != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR, "do_modrdn: get_ctrls failed\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, "do_modrdn: get_ctrls failed\n", 0, 0, 0 );
-#endif
/* get_ctrls has sent results. Now clean up. */
goto cleanup;
@@ -172,14 +138,8 @@ do_modrdn(
rs->sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn, op->o_tmpmemctx );
if( rs->sr_err != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, INFO,
- "do_modrdn: conn %d invalid dn (%s)\n",
- op->o_connid, dn.bv_val, 0 );
-#else
Debug( LDAP_DEBUG_ANY,
"do_modrdn: invalid dn (%s)\n", dn.bv_val, 0, 0 );
-#endif
send_ldap_error( op, rs, LDAP_INVALID_DN_SYNTAX, "invalid DN" );
goto cleanup;
}
@@ -188,26 +148,15 @@ do_modrdn(
rs->sr_err = dnPrettyNormal( NULL, &newrdn, &op->orr_newrdn, &op->orr_nnewrdn, op->o_tmpmemctx );
if( rs->sr_err != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, INFO,
- "do_modrdn: conn %d invalid newrdn (%s)\n",
- op->o_connid, newrdn.bv_val, 0 );
-#else
Debug( LDAP_DEBUG_ANY,
"do_modrdn: invalid newrdn (%s)\n", newrdn.bv_val, 0, 0 );
-#endif
send_ldap_error( op, rs, LDAP_INVALID_DN_SYNTAX, "invalid new RDN" );
goto cleanup;
}
if( rdn_validate( &op->orr_newrdn ) != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "do_modrdn: invalid rdn (%s).\n", op->orr_newrdn.bv_val, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid rdn (%s)\n",
op->orr_newrdn.bv_val, 0, 0 );
-#endif
send_ldap_error( op, rs, LDAP_INVALID_DN_SYNTAX, "invalid new RDN" );
goto cleanup;
@@ -217,15 +166,9 @@ do_modrdn(
rs->sr_err = dnPrettyNormal( NULL, &newSuperior, &pnewSuperior,
&nnewSuperior, op->o_tmpmemctx );
if( rs->sr_err != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, INFO,
- "do_modrdn: conn %d invalid newSuperior (%s)\n",
- op->o_connid, newSuperior.bv_val, 0 );
-#else
Debug( LDAP_DEBUG_ANY,
"do_modrdn: invalid newSuperior (%s)\n",
newSuperior.bv_val, 0, 0 );
-#endif
send_ldap_error( op, rs, LDAP_INVALID_DN_SYNTAX, "invalid newSuperior" );
goto cleanup;
}
@@ -238,7 +181,6 @@ do_modrdn(
rs->sr_err = frontendDB->be_modrdn( op, rs );
cleanup:
-
slap_graduate_commit_csn( op );
op->o_tmpfree( op->o_req_dn.bv_val, op->o_tmpmemctx );
@@ -247,8 +189,10 @@ cleanup:
op->o_tmpfree( op->orr_newrdn.bv_val, op->o_tmpmemctx );
op->o_tmpfree( op->orr_nnewrdn.bv_val, op->o_tmpmemctx );
- if ( pnewSuperior.bv_val ) op->o_tmpfree( pnewSuperior.bv_val, op->o_tmpmemctx );
- if ( nnewSuperior.bv_val ) op->o_tmpfree( nnewSuperior.bv_val, op->o_tmpmemctx );
+ if ( !BER_BVISNULL( &pnewSuperior ) )
+ op->o_tmpfree( pnewSuperior.bv_val, op->o_tmpmemctx );
+ if ( !BER_BVISNULL( &nnewSuperior ) )
+ op->o_tmpfree( nnewSuperior.bv_val, op->o_tmpmemctx );
return rs->sr_err;
}
@@ -259,36 +203,26 @@ fe_op_modrdn( Operation *op, SlapReply *rs )
Backend *newSuperior_be = NULL;
int manageDSAit;
struct berval pdn = BER_BVNULL;
+ BackendDB *op_be;
if( op->o_req_ndn.bv_len == 0 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "do_modrdn: attempt to modify root DSE.\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, "do_modrdn: root dse!\n", 0, 0, 0 );
-#endif
send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
"cannot rename the root DSE" );
goto cleanup;
} else if ( bvmatch( &op->o_req_ndn, &frontendDB->be_schemandn ) ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "do_modrdn: attempt to modify subschema subentry: %s (%ld)\n",
- frontendDB->be_schemandn.bv_val, (long)frontendDB->be_schemandn.bv_len, 0 );
-#else
Debug( LDAP_DEBUG_ANY, "do_modrdn: subschema subentry: %s (%ld)\n",
frontendDB->be_schemandn.bv_val, (long)frontendDB->be_schemandn.bv_len, 0 );
-#endif
send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
"cannot rename subschema subentry" );
goto cleanup;
}
- Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu MODRDN dn=\"%s\"\n",
- op->o_connid, op->o_opid, op->o_req_dn.bv_val, 0, 0 );
+ Statslog( LDAP_DEBUG_STATS, "%s MODRDN dn=\"%s\"\n",
+ op->o_log_prefix, op->o_req_dn.bv_val, 0, 0, 0 );
manageDSAit = get_manageDSAit( op );
@@ -297,7 +231,7 @@ fe_op_modrdn( Operation *op, SlapReply *rs )
* appropriate one, or send a referral to our "referral server"
* if we don't hold it.
*/
- op->o_bd = select_backend( &op->o_req_ndn, manageDSAit, 0 );
+ op->o_bd = select_backend( &op->o_req_ndn, manageDSAit, 1 );
if ( op->o_bd == NULL ) {
rs->sr_ref = referral_rewrite( default_referral,
NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
@@ -305,16 +239,26 @@ fe_op_modrdn( Operation *op, SlapReply *rs )
if ( rs->sr_ref != NULL ) {
rs->sr_err = LDAP_REFERRAL;
+ op->o_bd = frontendDB;
send_ldap_result( op, rs );
+ op->o_bd = NULL;
if (rs->sr_ref != default_referral) ber_bvarray_free( rs->sr_ref );
} else {
+ op->o_bd = frontendDB;
send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
"no global superior knowledge" );
+ op->o_bd = NULL;
}
goto cleanup;
}
+ /* If we've got a glued backend, check the real backend */
+ op_be = op->o_bd;
+ if ( SLAP_GLUE_INSTANCE( op->o_bd )) {
+ op->o_bd = select_backend( &op->o_req_ndn, manageDSAit, 0 );
+ }
+
/* check restrictions */
if( backend_check_restrictions( op, rs, NULL ) != LDAP_SUCCESS ) {
send_ldap_result( op, rs );
@@ -358,13 +302,8 @@ fe_op_modrdn( Operation *op, SlapReply *rs )
* 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 *)&rs->sr_err ) != 0 ) ||
rs->sr_err == LDAP_SUCCESS ) {
rs->sr_err = LDAP_OTHER;
@@ -388,6 +327,9 @@ fe_op_modrdn( Operation *op, SlapReply *rs )
#endif
{
slap_callback cb = { NULL, slap_replog_cb, NULL, NULL };
+
+ op->o_bd = op_be;
+
#ifdef SLAPD_MULTIMASTER
if ( !op->o_bd->be_update_ndn.bv_len || !repl_user )
#endif
@@ -411,7 +353,7 @@ fe_op_modrdn( Operation *op, SlapReply *rs )
org_managedsait = get_manageDSAit( op );
op->o_dn = op->o_bd->be_rootdn;
op->o_ndn = op->o_bd->be_rootndn;
- op->o_managedsait = 1;
+ op->o_managedsait = SLAP_CONTROL_NONCRITICAL;
while ( rs->sr_err == LDAP_SUCCESS &&
op->o_delete_glue_parent ) {
@@ -463,13 +405,8 @@ fe_op_modrdn( Operation *op, SlapReply *rs )
#if defined( LDAP_SLAPI )
if ( pb != NULL && slapi_int_call_plugins( op->o_bd, 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 ) */
@@ -504,34 +441,21 @@ slap_modrdn2mods(
rs->sr_err = slap_bv2ad( &new_rdn[a_cnt]->la_attr, &desc, &rs->sr_text );
if ( rs->sr_err != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
- LDAP_LOG ( OPERATION, ERR,
- "slap_modrdn2modlist: %s: %s (new)\n",
- rs->sr_text,
- new_rdn[ a_cnt ]->la_attr.bv_val, 0 );
-#else
Debug( LDAP_DEBUG_TRACE,
"slap_modrdn2modlist: %s: %s (new)\n",
rs->sr_text,
new_rdn[ a_cnt ]->la_attr.bv_val, 0 );
-#endif
goto done;
}
/* ACL check of newly added attrs */
if ( op->o_bd && !access_allowed( op, e, desc,
&new_rdn[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[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[ a_cnt ]->la_attr.bv_val, 0, 0 );
-#endif
+ rs->sr_text = "access to naming attributes (new) not allowed";
rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
goto done;
}
@@ -568,19 +492,11 @@ slap_modrdn2mods(
rs->sr_err = slap_bv2ad( &old_rdn[d_cnt]->la_attr, &desc, &rs->sr_text );
if ( rs->sr_err != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
- LDAP_LOG ( OPERATION, ERR,
- "slap_modrdn2modlist: %s: %s (old)\n",
- rs->sr_text,
- old_rdn[d_cnt]->la_attr.bv_val,
- 0 );
-#else
Debug( LDAP_DEBUG_TRACE,
"slap_modrdn2modlist: %s: %s (old)\n",
rs->sr_text,
old_rdn[d_cnt]->la_attr.bv_val,
0 );
-#endif
goto done;
}
@@ -588,19 +504,12 @@ slap_modrdn2mods(
if ( op->o_bd && !access_allowed( op, e, desc,
&old_rdn[d_cnt]->la_value, ACL_WRITE,
NULL ) ) {
-#ifdef NEW_LOGGING
- LDAP_LOG ( OPERATION, ERR,
- "slap_modrdn2modlist: access "
- "to attr \"%s\" (old) not allowed\n",
- old_rdn[ d_cnt ]->la_attr.bv_val,
- 0, 0 );
-#else
Debug( LDAP_DEBUG_TRACE,
"slap_modrdn2modlist: access "
"to attr \"%s\" (old) not allowed\n",
old_rdn[ d_cnt ]->la_attr.bv_val,
0, 0 );
-#endif
+ rs->sr_text = "access to naming attributes (old) not allowed";
rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
goto done;
}
@@ -632,7 +541,7 @@ slap_modrdn2mods(
done:
- if ( !repl_user ) {
+ if ( rs->sr_err == LDAP_SUCCESS && !repl_user ) {
char textbuf[ SLAP_TEXT_BUFLEN ];
size_t textlen = sizeof textbuf;
@@ -643,7 +552,8 @@ done:
/* empty */
}
- rs->sr_err = slap_mods_opattrs( op, mod, modtail, &rs->sr_text, textbuf, textlen );
+ rs->sr_err = slap_mods_opattrs( op, mod, modtail,
+ &rs->sr_text, textbuf, textlen, 1 );
}
/* LDAP v2 supporting correct attribute handling. */