error message from be_entry_put tool backend function

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

diff --git a/servers/slapd/back-ldap/add.c b/servers/slapd/back-ldap/add.c
index 8d0c79b994e5d06ef05a153c6649c3ba3dde2f03..7dfcd9ad0897fafce4220b561e09c74d7ad98fe7 100644 (file)
--- a/servers/slapd/back-ldap/add.c
+++ b/servers/slapd/back-ldap/add.c
@@ -1,7 +1,7 @@
 /* add.c - ldap backend add function */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 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 */
@@ -55,10 +55,10 @@ ldap_back_add(
 {
        struct ldapinfo *li = (struct ldapinfo *) be->be_private;
        struct ldapconn *lc;
-       int i;
+       int i, j;
        Attribute *a;
        LDAPMod **attrs;
-       char *mapped;
+       struct berval mapped;
        struct berval mdn = { 0, NULL };
 
 #ifdef NEW_LOGGING
@@ -79,8 +79,10 @@ ldap_back_add(
 #ifdef ENABLE_REWRITE
        switch (rewrite_session( li->rwinfo, "addDn", e->e_dn, conn, &mdn.bv_val )) {
        case REWRITE_REGEXEC_OK:
-               if ( mdn.bv_val == NULL ) {
-                       mdn.bv_val = e->e_dn;
+               if ( mdn.bv_val != NULL && mdn.bv_val[ 0 ] != '\0' ) {
+                       mdn.bv_len = strlen( mdn.bv_val );
+               } else {
+                       mdn = e->e_name;
                }
 #ifdef NEW_LOGGING
                LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
@@ -133,8 +135,8 @@ ldap_back_add(
                }
 #endif
                
-               mapped = ldap_back_map(&li->at_map, a->a_desc->ad_cname.bv_val, 0);
-               if (mapped == NULL) {
+               ldap_back_map(&li->at_map, &a->a_desc->ad_cname, &mapped, 0);
+               if (mapped.bv_val == NULL) {
                        continue;
                }
 
@@ -144,7 +146,7 @@ ldap_back_add(
                }
 
                attrs[i]->mod_op = LDAP_MOD_BVALUES;
-               attrs[i]->mod_type = mapped;
+               attrs[i]->mod_type = mapped.bv_val;
 
 #ifdef ENABLE_REWRITE
                /*
@@ -158,14 +160,20 @@ ldap_back_add(
                }
 #endif /* ENABLE_REWRITE */
 
-               attrs[i]->mod_vals.modv_bvals = a->a_vals;
+               for (j=0; a->a_vals[j].bv_val; j++);
+               attrs[i]->mod_vals.modv_bvals = ch_malloc((j+1)*sizeof(struct berval *));
+               for (j=0; a->a_vals[j].bv_val; j++)
+                       attrs[i]->mod_vals.modv_bvals[j] = &a->a_vals[j];
+               attrs[i]->mod_vals.modv_bvals[j] = NULL;
                i++;
        }
        attrs[i] = NULL;
 
        ldap_add_s(lc->ld, mdn.bv_val, attrs);
-       for (--i; i>= 0; --i)
+       for (--i; i>= 0; --i) {
+               free(attrs[i]->mod_vals.modv_bvals);
                free(attrs[i]);
+       }
        free(attrs);
        if ( mdn.bv_val != e->e_dn ) {
                free( mdn.bv_val );
@@ -178,15 +186,14 @@ ldap_back_add(
 int
 ldap_dnattr_rewrite(
                struct rewrite_info     *rwinfo,
-               struct berval           **a_vals,
+               BVarray                 a_vals,
                void                    *cookie
 )
 {
-       int j;
        char *mattr;
        
-       for ( j = 0; a_vals[ j ] != NULL; j++ ) {
-               switch ( rewrite_session( rwinfo, "bindDn", a_vals[ j ]->bv_val,
+       for ( ; a_vals->bv_val != NULL; a_vals++ ) {
+               switch ( rewrite_session( rwinfo, "bindDn", a_vals->bv_val,
                                        cookie, &mattr )) {
                case REWRITE_REGEXEC_OK:
                        if ( mattr == NULL ) {
@@ -197,17 +204,17 @@ ldap_dnattr_rewrite(
                        LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
                                        "[rw] bindDn (in add of dn-valued"
                                        " attr): \"%s\" -> \"%s\"\n",
-                                       a_vals[ j ]->bv_val, mattr ));
+                                       a_vals->bv_val, mattr ));
 #else /* !NEW_LOGGING */
                        Debug( LDAP_DEBUG_ARGS,
                                        "rw> bindDn (in add of dn-valued attr):"
                                        " \"%s\" -> \"%s\"\n%s",
-                                       a_vals[ j ]->bv_val, mattr, "" );
+                                       a_vals->bv_val, mattr, "" );
 #endif /* !NEW_LOGGING */
 
-                       free( a_vals[ j ]->bv_val );
-                       a_vals[ j ]->bv_val = mattr;
-                       a_vals[ j ]->bv_len = strlen( mattr );
+                       free( a_vals->bv_val );
+                       a_vals->bv_val = mattr;
+                       a_vals->bv_len = strlen( mattr );
                        
                        break;