fix for select_backend suggested G. Gombas (ITS 1090)

[openldap] / servers / slapd / back-ldap / modify.c

diff --git a/servers/slapd/back-ldap/modify.c b/servers/slapd/back-ldap/modify.c
index 3245a231fd29b1c80633e8ac985dfefe152445d8..fb7bfc669934a136b826f78b218698eadb5c7856 100644 (file)
--- a/servers/slapd/back-ldap/modify.c
+++ b/servers/slapd/back-ldap/modify.c
@@ -1,6 +1,10 @@
 /* modify.c - ldap backend modify function */
 /* $OpenLDAP$ */
-
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+/* This is an altered version */
 /*
  * Copyright 1999, Howard Chu, All rights reserved. <hyc@highlandsun.com>
  * 
@@ -20,6 +24,15 @@
  *    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"
@@ -37,36 +50,56 @@ ldap_back_modify(
     Backend    *be,
     Connection *conn,
     Operation  *op,
-    char       *dn,
-    char       *ndn,
-    LDAPModList        *ml
+    const char *dn,
+    const char *ndn,
+    Modifications      *modlist
 )
 {
        struct ldapinfo *li = (struct ldapinfo *) be->be_private;
        struct ldapconn *lc;
-       LDAPMod **mods;
-       LDAPModList *m;
+       LDAPMod **modv;
+       LDAPMod *mods;
+       Modifications *ml;
        int i;
+       char *mdn, *mapped;
 
        lc = ldap_back_getconn(li, conn, op);
-       if (!lc)
+       if ( !lc || !ldap_back_dobind( lc, op ) ) {
                return( -1 );
+       }
 
-       if (!lc->bound) {
-               ldap_back_dobind(lc, op);
-               if (!lc->bound)
-                       return( -1 );
+       mdn = ldap_back_dn_massage( li, ch_strdup( dn ), 0 );
+       if ( mdn == NULL ) {
+               return( -1 );
        }
 
-       for (i=1, m=ml->ml_next; m; i++,m=m->ml_next)
+       for (i=0, ml=modlist; ml; i++,ml=ml->sml_next)
                ;
-       mods = (LDAPMod **)ch_malloc((i+1)*sizeof(LDAPMod *));
-       mods[i] = 0;
 
-       for (i=0, m=ml; m; i++, m=m->ml_next)
-               mods[i] = &m->ml_mod;
+       mods = (LDAPMod *)ch_malloc(i*sizeof(LDAPMod));
+       if (mods == NULL)
+               return( -1 );
+       modv = (LDAPMod **)ch_malloc((i+1)*sizeof(LDAPMod *));
+       if (modv == NULL) {
+               free(mods);
+               return( -1 );
+       }
+
+       for (i=0, ml=modlist; ml; ml=ml->sml_next) {
+               mapped = ldap_back_map(&li->at_map, ml->sml_desc->ad_cname->bv_val, 0);
+               if (mapped != NULL) {
+                       modv[i] = &mods[i];
+                       mods[i].mod_op = ml->sml_op | LDAP_MOD_BVALUES;
+                       mods[i].mod_type = mapped;
+                       mods[i].mod_bvalues = ml->sml_bvalues;
+                       i++;
+               }
+       }
+       modv[i] = 0;
 
-       ldap_modify_s( lc->ld, dn, mods );
-       free(mods);     
+       ldap_modify_s( lc->ld, mdn, modv );
+       free( mdn );
+       free(mods);
+       free(modv);
        return( ldap_back_op_result( lc, op ));
 }