struct berval mapped;
struct berval mdn = { 0, NULL };
ber_int_t msgid;
+ dncookie dc;
lc = ldap_back_getconn(op, rs);
if ( !lc || !ldap_back_dobind( lc, op, rs ) ) {
/*
* Rewrite the modify dn, if needed
*/
+ dc.rwmap = &li->rwmap;
#ifdef ENABLE_REWRITE
- switch ( rewrite_session( li->rwinfo, "modifyDn", op->o_req_dn.bv_val, op->o_conn, &mdn.bv_val ) ) {
- case REWRITE_REGEXEC_OK:
- if ( mdn.bv_val == NULL ) {
- mdn.bv_val = ( char * )op->o_req_dn.bv_val;
- }
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDAP, DETAIL1,
- "[rw] modifyDn: \"%s\" -> \"%s\"\n", op->o_req_dn.bv_val, mdn.bv_val, 0 );
-#else /* !NEW_LOGGING */
- Debug( LDAP_DEBUG_ARGS, "rw> modifyDn: \"%s\" -> \"%s\"\n%s",
- op->o_req_dn.bv_val, mdn.bv_val, "" );
-#endif /* !NEW_LOGGING */
- break;
-
- case REWRITE_REGEXEC_UNWILLING:
- send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
- "Operation not allowed" );
- return( -1 );
-
- case REWRITE_REGEXEC_ERR:
- send_ldap_error( op, rs, LDAP_OTHER,
- "Rewrite error" );
- return( -1 );
+ dc.conn = op->o_conn;
+ dc.rs = rs;
+ dc.ctx = "modifyDn";
+#else
+ dc.tofrom = 1;
+ dc.normalized = 0;
+#endif
+ if ( ldap_back_dn_massage( &dc, &op->o_req_dn, &mdn ) ) {
+ send_ldap_result( op, rs );
+ return -1;
}
-#else /* !ENABLE_REWRITE */
- ldap_back_dn_massage( li, &op->o_req_dn, &mdn, 0, 1 );
-#endif /* !ENABLE_REWRITE */
for (i=0, ml=op->oq_modify.rs_modlist; ml; i++,ml=ml->sml_next)
;
goto cleanup;
}
+#ifdef ENABLE_REWRITE
+ dc.ctx = "modifyAttrDN";
+#endif
for (i=0, ml=op->oq_modify.rs_modlist; ml; ml=ml->sml_next) {
+ int is_oc = 0;
+
if ( ml->sml_desc->ad_type->sat_no_user_mod ) {
continue;
}
- ldap_back_map(&li->at_map, &ml->sml_desc->ad_cname, &mapped,
- BACKLDAP_MAP);
- if (mapped.bv_val == NULL || mapped.bv_val[0] == '\0') {
- continue;
+ if ( ml->sml_desc == slap_schema.si_ad_objectClass
+ || ml->sml_desc == slap_schema.si_ad_structuralObjectClass ) {
+ is_oc = 1;
+ mapped = ml->sml_desc->ad_cname;
+
+ } else {
+ ldap_back_map(&li->rwmap.rwm_at,
+ &ml->sml_desc->ad_cname,
+ &mapped, BACKLDAP_MAP);
+ if (mapped.bv_val == NULL || mapped.bv_val[0] == '\0') {
+ continue;
+ }
}
modv[i] = &mods[i];
mods[i].mod_op = ml->sml_op | LDAP_MOD_BVALUES;
mods[i].mod_type = mapped.bv_val;
-#ifdef ENABLE_REWRITE
- /*
- * FIXME: dn-valued attrs should be rewritten
- * to allow their use in ACLs at the back-ldap
- * level.
- */
- if ( strcmp( ml->sml_desc->ad_type->sat_syntax->ssyn_oid,
- SLAPD_DN_SYNTAX ) == 0 ) {
- ldap_dnattr_rewrite( li->rwinfo,
- ml->sml_bvalues, op->o_conn );
- }
-#endif /* ENABLE_REWRITE */
-
- if ( ml->sml_bvalues != NULL ) {
- for (j = 0; ml->sml_bvalues[j].bv_val; j++);
- mods[i].mod_bvalues = (struct berval **)ch_malloc((j+1) *
- sizeof(struct berval *));
- for (j = 0; ml->sml_bvalues[j].bv_val; j++)
- mods[i].mod_bvalues[j] = &ml->sml_bvalues[j];
- mods[i].mod_bvalues[j] = NULL;
+ if ( ml->sml_bvalues != NULL ) {
+ if ( is_oc ) {
+ for (j = 0; ml->sml_bvalues[j].bv_val; j++);
+ mods[i].mod_bvalues = (struct berval **)ch_malloc((j+1) *
+ sizeof(struct berval *));
+ for (j = 0; ml->sml_bvalues[j].bv_val; j++) {
+ ldap_back_map(&li->rwmap.rwm_oc,
+ &ml->sml_bvalues[j],
+ &mapped, BACKLDAP_MAP);
+ if (mapped.bv_val == NULL || mapped.bv_val[0] == '\0') {
+ continue;
+ }
+ mods[i].mod_bvalues[j] = &mapped;
+ }
+ mods[i].mod_bvalues[j] = NULL;
+
+ } else {
+ if ( ml->sml_desc->ad_type->sat_syntax ==
+ slap_schema.si_syn_distinguishedName ) {
+ ldap_dnattr_rewrite( &dc, ml->sml_bvalues );
+ }
+
+ if ( ml->sml_bvalues == NULL ) {
+ continue;
+ }
+
+ for (j = 0; ml->sml_bvalues[j].bv_val; j++);
+ mods[i].mod_bvalues = (struct berval **)ch_malloc((j+1) *
+ sizeof(struct berval *));
+ for (j = 0; ml->sml_bvalues[j].bv_val; j++)
+ mods[i].mod_bvalues[j] = &ml->sml_bvalues[j];
+ mods[i].mod_bvalues[j] = NULL;
+ }
+
} else {
mods[i].mod_bvalues = NULL;
}
}
modv[i] = 0;
- rc = ldap_modify_ext( lc->ld, mdn.bv_val, modv, op->o_ctrls, NULL, &msgid );
+ rs->sr_err = ldap_modify_ext( lc->ld, mdn.bv_val, modv,
+ op->o_ctrls, NULL, &msgid );
cleanup:;
if ( mdn.bv_val != op->o_req_dn.bv_val ) {
ch_free( mods );
ch_free( modv );
- return ldap_back_op_result( li, lc, op, rs, msgid, rc, 1 );
+ return ldap_back_op_result( lc, op, rs, msgid, 1 );
}