Changed struct berval ** to BVarray

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

diff --git a/servers/slapd/back-ldap/add.c b/servers/slapd/back-ldap/add.c
index cccc79e2bae61f2cd9dec622bad034c2597dc6af..d7e145d8b754dd1cad210a2304ace365d612ae8d 100644 (file)
--- a/servers/slapd/back-ldap/add.c
+++ b/servers/slapd/back-ldap/add.c
@@ -55,11 +55,19 @@ ldap_back_add(
 {
        struct ldapinfo *li = (struct ldapinfo *) be->be_private;
        struct ldapconn *lc;
-       int i;
+       int i, j;
        Attribute *a;
        LDAPMod **attrs;
-       char *mdn = NULL, *mapped;
-
+       struct berval mapped;
+       struct berval mdn = { 0, NULL };
+
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY, "ldap_back_add: %s\n",
+                               e->e_dn ));
+#else /* !NEW_LOGGING */
+       Debug(LDAP_DEBUG_ARGS, "==> ldap_back_add: %s\n", e->e_dn, 0, 0);
+#endif /* !NEW_LOGGING */
+       
        lc = ldap_back_getconn(li, conn, op);
        if ( !lc || !ldap_back_dobind( lc, op ) ) {
                return( -1 );
@@ -69,24 +77,33 @@ ldap_back_add(
         * Rewrite the add dn, if needed
         */
 #ifdef ENABLE_REWRITE
-       switch (rewrite_session( li->rwinfo, "addDn", e->e_dn, conn, &mdn )) {
+       switch (rewrite_session( li->rwinfo, "addDn", e->e_dn, conn, &mdn.bv_val )) {
        case REWRITE_REGEXEC_OK:
-       if ( mdn == NULL ) {
-                       mdn = e->e_dn;
+               if ( mdn.bv_val == NULL ) {
+                       mdn.bv_val = e->e_dn;
                }
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
+                                       "[rw] addDn: \"%s\" -> \"%s\"\n",
+                                       e->e_dn, mdn.bv_val ));         
+#else /* !NEW_LOGGING */
                Debug( LDAP_DEBUG_ARGS, "rw> addDn: \"%s\" -> \"%s\"\n%s", 
-                               e->e_dn, mdn, "" );
+                               e->e_dn, 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( e->e_dn ), 0 );
+       ldap_back_dn_massage( li, &e->e_name, &mdn, 0, 1 );
 #endif /* !ENABLE_REWRITE */
 
        /* Count number of attributes in entry */
@@ -103,21 +120,21 @@ ldap_back_add(
                 * of the target directory are used, if available
                 */
 #if 0
-               if ( !strcasecmp( a->a_desc->ad_cname->bv_val,
-                       slap_schema.si_ad_creatorsName->ad_cname->bv_val )
-                       || !strcasecmp( a->a_desc->ad_cname->bv_val,
-                       slap_schema.si_ad_createTimestamp->ad_cname->bv_val )
-                       || !strcasecmp( a->a_desc->ad_cname->bv_val,
-                       slap_schema.si_ad_modifiersName->ad_cname->bv_val )
-                       || !strcasecmp( a->a_desc->ad_cname->bv_val,
-                       slap_schema.si_ad_modifyTimestamp->ad_cname->bv_val )
+               if ( !strcasecmp( a->a_desc->ad_cname.bv_val,
+                       slap_schema.si_ad_creatorsName->ad_cname.bv_val )
+                       || !strcasecmp( a->a_desc->ad_cname.bv_val,
+                       slap_schema.si_ad_createTimestamp->ad_cname.bv_val )
+                       || !strcasecmp( a->a_desc->ad_cname.bv_val,
+                       slap_schema.si_ad_modifiersName->ad_cname.bv_val )
+                       || !strcasecmp( a->a_desc->ad_cname.bv_val,
+                       slap_schema.si_ad_modifyTimestamp->ad_cname.bv_val )
                ) {
                        continue;
                }
 #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;
                }
 
@@ -127,7 +144,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
                /*
@@ -141,22 +158,23 @@ 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];
                i++;
        }
        attrs[i] = NULL;
 
-       ldap_add_s(lc->ld, mdn, attrs);
-       for (--i; i>= 0; --i)
+       ldap_add_s(lc->ld, mdn.bv_val, attrs);
+       for (--i; i>= 0; --i) {
+               free(attrs[i]->mod_vals.modv_bvals);
                free(attrs[i]);
+       }
        free(attrs);
-#ifdef ENABLE_REWRITE
-       if ( mdn != e->e_dn ) {
-#endif /* ENABLE_REWRITE */
-       free( mdn );
-#ifdef ENABLE_REWRITE
+       if ( mdn.bv_val != e->e_dn ) {
+               free( mdn.bv_val );
        }
-#endif /* ENABLE_REWRITE */
        
        return( ldap_back_op_result( lc, op ) );
 }
@@ -180,11 +198,18 @@ ldap_dnattr_rewrite(
                                /* no substitution */
                                continue;
                        }
+#ifdef NEW_LOGGING
+                       LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
+                                       "[rw] bindDn (in add of dn-valued"
+                                       " attr): \"%s\" -> \"%s\"\n",
+                                       a_vals[ j ]->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, "" );
-                       
+#endif /* !NEW_LOGGING */
+
                        free( a_vals[ j ]->bv_val );
                        a_vals[ j ]->bv_val = mattr;
                        a_vals[ j ]->bv_len = strlen( mattr );