/* modify.c - ldap backend modify function */
/* $OpenLDAP$ */
/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/* This is an altered version */
* ever read sources, credits should appear in the documentation.
*
* 4. This notice may not be removed or altered.
+ *
+ *
+ *
+ * Copyright 2000, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
+ *
+ * This software is being modified by Pierangelo Masarati.
+ * The previously reported conditions apply to the modified code as well.
+ * Changes in the original code are highlighted where required.
+ * Credits for the original code go to the author, Howard Chu.
*/
#include "portable.h"
int
ldap_back_modify(
- Backend *be,
- Connection *conn,
Operation *op,
- const char *dn,
- const char *ndn,
- Modifications *modlist
-)
+ SlapReply *rs )
{
- struct ldapinfo *li = (struct ldapinfo *) be->be_private;
+ struct ldapinfo *li = (struct ldapinfo *) op->o_bd->be_private;
struct ldapconn *lc;
- LDAPMod **modv;
+ LDAPMod **modv = NULL;
LDAPMod *mods;
Modifications *ml;
- int i;
+ int i, j, rc;
+ struct berval mapped;
+ struct berval mdn = { 0, NULL };
+ ber_int_t msgid;
+ dncookie dc;
- lc = ldap_back_getconn(li, conn, op);
- if (!lc)
+ lc = ldap_back_getconn(op, rs);
+ if ( !lc || !ldap_back_dobind( lc, op, rs ) ) {
return( -1 );
+ }
- if (!lc->bound) {
- ldap_back_dobind(lc, op);
- if (!lc->bound)
- return( -1 );
+ /*
+ * Rewrite the modify dn, if needed
+ */
+ dc.rwmap = &li->rwmap;
+#ifdef ENABLE_REWRITE
+ 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;
}
- for (i=0, ml=modlist; ml; i++,ml=ml->sml_next)
+ for (i=0, ml=op->oq_modify.rs_modlist; ml; i++,ml=ml->sml_next)
;
mods = (LDAPMod *)ch_malloc(i*sizeof(LDAPMod));
- if (mods == NULL)
- return( -1 );
+ if (mods == NULL) {
+ rc = LDAP_NO_MEMORY;
+ goto cleanup;
+ }
modv = (LDAPMod **)ch_malloc((i+1)*sizeof(LDAPMod *));
if (modv == NULL) {
- free(mods);
- return( -1 );
+ rc = LDAP_NO_MEMORY;
+ goto cleanup;
}
- modv[i] = 0;
+#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;
+ }
+
+ 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;
+ }
+ }
- for (i=0, ml=modlist; ml; i++, ml=ml->sml_next) {
modv[i] = &mods[i];
- mods[i].mod_op = ml->sml_op;
- mods[i].mod_type = ml->sml_desc->ad_cname->bv_val;
- mods[i].mod_bvalues = ml->sml_bvalues;
+ mods[i].mod_op = ml->sml_op | LDAP_MOD_BVALUES;
+ mods[i].mod_type = mapped.bv_val;
+
+ 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;
+ }
+
+ i++;
+ }
+ modv[i] = 0;
+
+ 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 ) {
+ free( mdn.bv_val );
}
+ for (i=0; modv[i]; i++) {
+ ch_free(modv[i]->mod_bvalues);
+ }
+ ch_free( mods );
+ ch_free( modv );
- ldap_modify_s( lc->ld, dn, modv );
- free(mods);
- free(modv);
- return( ldap_back_op_result( lc, op ));
+ return ldap_back_op_result( lc, op, rs, msgid, 1 );
}
+
projects / openldap / blobdiff