cleanup error messages

[openldap] / servers / slapd / back-sql / entry-id.c

diff --git a/servers/slapd/back-sql/entry-id.c b/servers/slapd/back-sql/entry-id.c
index 19f3cdac77e26f4df9c69e9f37799fc5629672a2..e1644e2f4011a20216dd7ddbbea1ec040d6a096f 100644 (file)
--- a/servers/slapd/back-sql/entry-id.c
+++ b/servers/slapd/back-sql/entry-id.c
@@ -25,14 +25,11 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include "ac/string.h"
+
 #include "lber_pvt.h"
 #include "ldap_pvt.h"
 #include "slap.h"
-#include "back-sql.h"
-#include "sql-wrap.h"
-#include "schema-map.h"
-#include "entry-id.h"
-#include "util.h"
+#include "proto-sql.h"
 
 backsql_entryID *
 backsql_free_entryID( backsql_entryID *id, int freeit )
@@ -239,7 +236,10 @@ backsql_count_children(
                char *end;
 
                *nchildren = strtol( row.cols[ 0 ], &end, 0 );
-               if ( end[ 0 ] != '\0' ) {
+               if ( end[ 0 ] != '\0' && end[0] != '.' ) {
+                       /* FIXME: braindead RDBMSes return
+                        * a fractional number from COUNT!
+                        */
                        res = LDAP_OTHER;
                }
 
@@ -367,7 +367,6 @@ Entry *
 backsql_id2entry( backsql_srch_info *bsi, Entry *e, backsql_entryID *eid )
 {
        int                     i;
-       backsql_at_map_rec      *at;
        int                     rc;
        AttributeDescription    *ad_oc = slap_schema.si_ad_objectClass;
 
@@ -391,23 +390,29 @@ backsql_id2entry( backsql_srch_info *bsi, Entry *e, backsql_entryID *eid )
                Debug( LDAP_DEBUG_TRACE, "backsql_id2entry(): "
                        "custom attribute list\n", 0, 0, 0 );
                for ( i = 0; bsi->bsi_attrs[ i ].an_name.bv_val; i++ ) {
-                       AttributeName *attr = &bsi->bsi_attrs[ i ];
+                       backsql_at_map_rec      **vat;
+                       AttributeName           *attr = &bsi->bsi_attrs[ i ];
+                       int                     j;
 
                        if ( attr->an_desc == ad_oc ) {
                                continue;
                        }
 
-                       at = backsql_ad2at( bsi->bsi_oc, attr->an_desc );
-                       if ( at != NULL ) {
-                               backsql_get_attr_vals( at, bsi );
-
-                       } else {
+                       rc = backsql_supad2at( bsi->bsi_oc, attr->an_desc, &vat );
+                       if ( rc != 0 || vat == NULL ) {
                                Debug( LDAP_DEBUG_TRACE, "backsql_id2entry(): "
-                                       "attribute '%s' is not defined "
-                                       "for objectlass '%s'\n",
-                                       attr->an_name.bv_val, 
-                                       BACKSQL_OC_NAME( bsi->bsi_oc ), 0 );
+                                               "attribute '%s' is not defined "
+                                               "for objectlass '%s'\n",
+                                               attr->an_name.bv_val, 
+                                               BACKSQL_OC_NAME( bsi->bsi_oc ), 0 );
+                               continue;
                        }
+
+                       for ( j = 0; vat[j]; j++ ) {
+                               backsql_get_attr_vals( vat[j], bsi );
+                       }
+
+                       ch_free( vat );
                }
 
        } else {