error message from be_entry_put tool backend function

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

diff --git a/servers/slapd/back-ldap/modify.c b/servers/slapd/back-ldap/modify.c
index 269ebf459114f06ad59dfddc9f68ffc66db74b7f..1c355fff4128ad7b85aecdbbf3453cc966b23fc3 100644 (file)
--- a/servers/slapd/back-ldap/modify.c
+++ b/servers/slapd/back-ldap/modify.c
@@ -1,7 +1,7 @@
 /* modify.c - ldap backend modify function */
 /* $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
  */
 /* This is an altered version */
@@ -50,18 +50,19 @@ ldap_back_modify(
     Backend    *be,
     Connection *conn,
     Operation  *op,
-    const char *dn,
-    const char *ndn,
+    struct berval      *dn,
+    struct berval      *ndn,
     Modifications      *modlist
 )
 {
        struct ldapinfo *li = (struct ldapinfo *) be->be_private;
        struct ldapconn *lc;
-       LDAPMod **modv;
+       LDAPMod **modv = NULL;
        LDAPMod *mods;
        Modifications *ml;
-       int i;
-       char *mdn = NULL, *mapped;
+       int i, j;
+       struct berval mapped;
+       struct berval mdn = { 0, NULL };
 
        lc = ldap_back_getconn(li, conn, op);
        if ( !lc || !ldap_back_dobind( lc, op ) ) {
@@ -72,24 +73,32 @@ ldap_back_modify(
         * Rewrite the modify dn, if needed
         */
 #ifdef ENABLE_REWRITE
-       switch ( rewrite_session( li->rwinfo, "modifyDn", dn, conn, &mdn ) ) {
+       switch ( rewrite_session( li->rwinfo, "modifyDn", dn->bv_val, conn, &mdn.bv_val ) ) {
        case REWRITE_REGEXEC_OK:
-               if ( mdn == NULL ) {
-                       mdn = ( char * )dn;
+               if ( mdn.bv_val == NULL ) {
+                       mdn.bv_val = ( char * )dn->bv_val;
                }
-               Debug( LDAP_DEBUG_ARGS, "rw> modifyDN: \"%s\" -> \"%s\"\n%s",
-                               dn, mdn, "" );
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
+                               "[rw] modifyDn: \"%s\" -> \"%s\"\n", dn->bv_val, mdn.bv_val ));
+#else /* !NEW_LOGGING */
+               Debug( LDAP_DEBUG_ARGS, "rw> modifyDn: \"%s\" -> \"%s\"\n%s",
+                               dn->bv_val, mdn.bv_val, "" );
+#endif /* !NEW_LOGGING */
                break;
                
        case REWRITE_REGEXEC_UNWILLING:
                send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
                                NULL, "Unwilling to perform", NULL, NULL );
+               return( -1 );
 
        case REWRITE_REGEXEC_ERR:
+               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                               NULL, "Operations error", NULL, NULL );
                return( -1 );
        }
 #else /* !ENABLE_REWRITE */
-       mdn = ldap_back_dn_massage( li, ch_strdup( dn ), 0 );
+       ldap_back_dn_massage( li, dn, &mdn, 0, 1 );
 #endif /* !ENABLE_REWRITE */
 
        for (i=0, ml=modlist; ml; i++,ml=ml->sml_next)
@@ -105,14 +114,14 @@ ldap_back_modify(
        }
 
        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) {
+               ldap_back_map(&li->at_map, &ml->sml_desc->ad_cname, &mapped, 0);
+               if (mapped.bv_val == NULL) {
                        continue;
                }
 
                modv[i] = &mods[i];
                mods[i].mod_op = ml->sml_op | LDAP_MOD_BVALUES;
-               mods[i].mod_type = mapped;
+               mods[i].mod_type = mapped.bv_val;
 
 #ifdef ENABLE_REWRITE
                /*
@@ -127,21 +136,28 @@ ldap_back_modify(
                }
 #endif /* ENABLE_REWRITE */
        
-               mods[i].mod_bvalues = ml->sml_bvalues;
+               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;
                i++;
        }
        modv[i] = 0;
 
-       ldap_modify_s( lc->ld, mdn, modv );
+       ldap_modify_s( lc->ld, mdn.bv_val, modv );
 
-cleanup:
+cleanup:;
 #ifdef ENABLE_REWRITE
-       if ( mdn != dn ) {
+       if ( mdn.bv_val != dn->bv_val ) {
 #endif /* ENABLE_REWRITE */
-               free( mdn );
+               free( mdn.bv_val );
 #ifdef ENABLE_REWRITE
        }
 #endif /* ENABLE_REWRITE */
+       for (i=0; modv[i]; i++)
+               free(modv[i]->mod_bvalues);
        free(mods);
        free(modv);
        return( ldap_back_op_result( lc, op ));