error message from be_entry_put tool backend function

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

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index 6f192f13b88c77912118b089632bc3bc8b2dca5d..69cb44963681ea045797dc6e8d56b3ca2dda5d9d 100644 (file)
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -1,7 +1,7 @@
 /* search.c - ldap backend search 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 */
@@ -149,7 +149,7 @@ ldap_back_search(
                                base->bv_val, conn, &mbase.bv_val ) ) {
        case REWRITE_REGEXEC_OK:
                if ( mbase.bv_val == NULL ) {
-                       mbase.bv_val = ( char * )base->bv_val;
+                       mbase = *base;
                }
 #ifdef NEW_LOGGING
                LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
@@ -185,7 +185,10 @@ ldap_back_search(
                                free( mfilter.bv_val );
                        }
                        mfilter = *filterstr;
+               } else {
+                       mfilter.bv_len = strlen( mfilter.bv_val );
                }
+
 #ifdef NEW_LOGGING
                LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
                                "[rw] searchFilter: \"%s\" -> \"%s\"\n",
@@ -223,13 +226,18 @@ ldap_back_search(
 #endif /* !ENABLE_REWRITE */
        }
 
+#ifdef ENABLE_REWRITE
+       if ( mfilter.bv_val != filterstr->bv_val ) {
+               ldap_memfree( mfilter.bv_val );
+       }
+#endif /* ENABLE_REWRITE */
+
        mapped_attrs = ldap_back_map_attrs(&li->at_map, attrs, 0);
        if ( mapped_attrs == NULL && attrs) {
-               AttributeName *an;
-               for (count=0, an=attrs; an; an=an->an_next,count++);
+               for (count=0; attrs[count].an_name.bv_val; count++);
                mapped_attrs = ch_malloc( (count+1) * sizeof(char *));
-               for (count=0, an=attrs; an; an=an->an_next,count++) {
-                       mapped_attrs[count] = an->an_name.bv_val;
+               for (count=0; attrs[count].an_name.bv_val; count++) {
+                       mapped_attrs[count] = attrs[count].an_name.bv_val;
                }
                mapped_attrs[count] = NULL;
        }
@@ -342,19 +350,9 @@ finish:;
        if ( mapped_attrs ) {
                free( mapped_attrs );
        }
-#ifdef ENABLE_REWRITE
-       if ( mapped_filter != mfilter.bv_val ) {
-               free( mapped_filter );
-       }
-       if ( mfilter.bv_val != filterstr->bv_val ) {
-               free( mfilter.bv_val );
-       }
-#else /* !ENABLE_REWRITE */
        if ( mapped_filter != filterstr->bv_val ) {
                free( mapped_filter );
        }
-#endif /* !ENABLE_REWRITE */
-       
        if ( mbase.bv_val != base->bv_val ) {
                free( mbase.bv_val );
        }
@@ -381,7 +379,7 @@ ldap_send_entry(
        struct berval *bv, bdn;
        const char *text;
 
-       if ( ber_scanf( &ber, "{o", &bdn ) == LBER_ERROR ) {
+       if ( ber_scanf( &ber, "{m{", &bdn ) == LBER_ERROR ) {
                return;
        }
 #ifdef ENABLE_REWRITE
@@ -394,7 +392,6 @@ ldap_send_entry(
        case REWRITE_REGEXEC_OK:
                if ( ent.e_name.bv_val == NULL ) {
                        ent.e_name = bdn;
-                       
                } else {
 #ifdef NEW_LOGGING
                        LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
@@ -404,8 +401,6 @@ ldap_send_entry(
                        Debug( LDAP_DEBUG_ARGS, "rw> searchResult: \"%s\""
                                        " -> \"%s\"\n%s", bdn.bv_val, ent.e_dn, "" );
 #endif /* !NEW_LOGGING */
-                       free( bdn.bv_val );
-                       bdn.bv_val = NULL;
                        ent.e_name.bv_len = strlen( ent.e_name.bv_val );
                }
                break;
@@ -424,7 +419,7 @@ ldap_send_entry(
        ent.e_private = 0;
        attrp = &ent.e_attrs;
 
-       while ( ber_scanf( &ber, "{{o", &a ) != LBER_ERROR ) {
+       while ( ber_scanf( &ber, "{m", &a ) != LBER_ERROR ) {
                ldap_back_map(&li->at_map, &a, &mapped, 1);
                if (mapped.bv_val == NULL)
                        continue;
@@ -438,35 +433,42 @@ ldap_send_entry(
                                        != LDAP_SUCCESS) {
 #ifdef NEW_LOGGING
                                LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-                                               "slap_str2undef_ad(%s): "
+                                               "slap_bv2undef_ad(%s):  "
                                                "%s\n", mapped.bv_val, text ));
 #else /* !NEW_LOGGING */
                                Debug( LDAP_DEBUG_ANY, 
-                                               "slap_str2undef_ad(%s): "
+                                               "slap_bv2undef_ad(%s):  "
                                                "%s\n%s", mapped.bv_val, text, "" );
 #endif /* !NEW_LOGGING */
-                               
                                ch_free(attr);
                                continue;
                        }
                }
+
+               /* no subschemaSubentry */
+               if ( attr->a_desc == slap_schema.si_ad_subschemaSubentry ) {
+                       ch_free(attr);
+                       continue;
+               }
+               
                if (ber_scanf( &ber, "[W]", &attr->a_vals ) == LBER_ERROR ) {
                        attr->a_vals = &dummy;
-               } else if ( strcasecmp( mapped.bv_val, "objectclass" ) == 0 ) {
+               } else if ( attr->a_desc == slap_schema.si_ad_objectClass
+                               || attr->a_desc == slap_schema.si_ad_structuralObjectClass ) {
                        int i, last;
                        for ( last = 0; attr->a_vals[last].bv_val; last++ ) ;
-                       for ( i = 0; ( bv = &attr->a_vals[i] ); i++ ) {
+                       for ( i = 0, bv = attr->a_vals; bv->bv_val; bv++, i++ ) {
                                ldap_back_map(&li->oc_map, bv, &mapped, 1);
                                if (mapped.bv_val == NULL) {
-                                       free(attr->a_vals[i].bv_val);
-                                       attr->a_vals[i].bv_val = NULL;
+                                       free(bv->bv_val);
+                                       bv->bv_val = NULL;
                                        if (--last < 0)
                                                break;
-                                       attr->a_vals[i] = attr->a_vals[last];
+                                       *bv = attr->a_vals[last];
                                        attr->a_vals[last].bv_val = NULL;
                                        i--;
                                } else if ( mapped.bv_val != bv->bv_val ) {
-                                       ch_free(bv->bv_val);
+                                       free(bv->bv_val);
                                        ber_dupbv( bv, &mapped );
                                }
                        }
@@ -486,7 +488,7 @@ ldap_send_entry(
                } else if ( strcmp( attr->a_desc->ad_type->sat_syntax->ssyn_oid,
                                        SLAPD_DN_SYNTAX ) == 0 ) {
                        int i;
-                       for ( i = 0; ( bv = &attr->a_vals[ i ] ); i++ ) {
+                       for ( i = 0, bv = attr->a_vals; bv->bv_val; bv++, i++ ) {
                                char *newval;
                                
                                switch ( rewrite_session( li->rwinfo,
@@ -512,7 +514,6 @@ ldap_send_entry(
                                                attr->a_desc->ad_type->sat_cname.bv_val,
                                                bv->bv_val, newval );
 #endif /* !NEW_LOGGING */
-                                       
                                        free( bv->bv_val );
                                        bv->bv_val = newval;
                                        bv->bv_len = strlen( newval );
@@ -545,9 +546,8 @@ ldap_send_entry(
                free(attr);
        }
        
-       if ( ent.e_dn )
+       if ( ent.e_dn && ent.e_dn != bdn.bv_val )
                free( ent.e_dn );
        if ( ent.e_ndn )
                free( ent.e_ndn );
 }
-