Cleanup up LDAP_CLIENT_UPDATE code... including some bug fixing.

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

diff --git a/servers/slapd/back-ldap/attribute.c b/servers/slapd/back-ldap/attribute.c
index 9f850df0de21675f147ea4db7aec8e467d37e53c..8c115f9b01c5b26564d099bdc3145682c4f045f4 100644 (file)
--- a/servers/slapd/back-ldap/attribute.c
+++ b/servers/slapd/back-ldap/attribute.c
@@ -27,29 +27,28 @@ ldap_back_attribute(
        Entry   *target,
        struct berval   *ndn,
        AttributeDescription *entry_at,
-       BVarray *vals
+       BerVarray *vals
 )
 {
        struct ldapinfo *li = (struct ldapinfo *) be->be_private;    
        int rc = 1, i, j, count, is_oc;
-       Attribute *attr;
-       BVarray abv, v;
-       struct berval mapped;
-       char **vs;
-       LDAPMessage     *result, *e;
+       Attribute *attr = NULL;
+       BerVarray abv, v;
+       struct berval mapped = { 0, NULL };
+       char **vs = NULL;
+       LDAPMessage     *result = NULL, *e = NULL;
        char *gattr[2];
-       LDAP *ld;
+       LDAP *ld = NULL;
 
        *vals = NULL;
-       if (target != NULL && target->e_nname.bv_len == ndn->bv_len &&
-               strcmp(target->e_nname.bv_val, ndn->bv_val) == 0) {
+       if (target != NULL && dn_match( &target->e_nname, ndn )) {
                /* we already have a copy of the entry */
                /* attribute and objectclass mapping has already been done */
                if ((attr = attr_find(target->e_attrs, entry_at)) == NULL)
                        return(1);
 
                for ( count = 0; attr->a_vals[count].bv_val != NULL; count++ ) { }
-               v = (BVarray) ch_calloc( (count + 1), sizeof(struct berval) );
+               v = (BerVarray) ch_calloc( (count + 1), sizeof(struct berval) );
                if (v != NULL) {
                        for ( j = 0, abv = attr->a_vals; --count >= 0; abv++ ) {
                                if ( abv->bv_len > 0 ) {
@@ -60,63 +59,79 @@ ldap_back_attribute(
                        }
                        v[j].bv_val = NULL;
                        *vals = v;
-                       rc = 0;
+                       return 0;
                }
 
-       } else {
-               ldap_back_map(&li->at_map, &entry_at->ad_cname, &mapped, 0);
-               if (mapped.bv_val == NULL)
-                       return(1);
+       }
+       ldap_back_map(&li->at_map, &entry_at->ad_cname, &mapped, 0);
+       if (mapped.bv_val == NULL) {
+               return 1;
+       }
 
-               if (ldap_initialize(&ld, li->url) != LDAP_SUCCESS) {
-                       return(1);
-               }
+       if (ldap_initialize(&ld, li->url) != LDAP_SUCCESS) {
+               return 1;
+       }
 
-               if (ldap_bind_s(ld, li->binddn, li->bindpw, LDAP_AUTH_SIMPLE) == LDAP_SUCCESS) {
-                       gattr[0] = mapped.bv_val;
-                       gattr[1] = NULL;
-                       if (ldap_search_ext_s(ld, ndn->bv_val, LDAP_SCOPE_BASE, "(objectclass=*)",
-                                                                       gattr, 0, NULL, NULL, LDAP_NO_LIMIT,
-                                                                       LDAP_NO_LIMIT, &result) == LDAP_SUCCESS)
-                       {
-                               if ((e = ldap_first_entry(ld, result)) != NULL) {
-                                       vs = ldap_get_values(ld, e, mapped.bv_val);
-                                       if (vs != NULL) {
-                                               for ( count = 0; vs[count] != NULL; count++ ) { }
-                                               v = (BVarray) ch_calloc( (count + 1), sizeof(struct berval) );
-                                               if (v == NULL) {
-                                                       ldap_value_free(vs);
-                                               } else {
-                                                       is_oc = (strcasecmp("objectclass", mapped.bv_val) == 0);
-                                                       for ( i = 0, j = 0; i < count; i++) {
-                                                               ber_str2bv(vs[i], 0, 0, &v[j] );
-                                                               if (!is_oc) {
-                                                                       if( v[j].bv_val == NULL )
-                                                                               ch_free(vs[i]);
-                                                                       else
-                                                                               j++;
-                                                               } else {
-                                                                       ldap_back_map(&li->oc_map, &v[j], &mapped, 1);
-                                                                       if (mapped.bv_val) {
-                                                                               ber_dupbv( &v[j], &mapped );
-                                                                               if (v[j].bv_val)
-                                                                                       j++;
-                                                                       }
-                                                                       ch_free(vs[i]);
-                                                               }
-                                                       }
-                                                       v[j].bv_val = NULL;
-                                                       *vals = v;
-                                                       rc = 0;
-                                                       ch_free(vs);
-                                               }
-                                       }
-                               }
-                               ldap_msgfree(result);
+       if (ldap_bind_s(ld, li->binddn, li->bindpw, LDAP_AUTH_SIMPLE) != LDAP_SUCCESS) {
+               goto cleanup;
+       }
+
+       gattr[0] = mapped.bv_val;
+       gattr[1] = NULL;
+       if (ldap_search_ext_s(ld, ndn->bv_val, LDAP_SCOPE_BASE, "(objectclass=*)",
+                               gattr, 0, NULL, NULL, LDAP_NO_LIMIT,
+                               LDAP_NO_LIMIT, &result) != LDAP_SUCCESS)
+       {
+               goto cleanup;
+       }
+
+       if ((e = ldap_first_entry(ld, result)) == NULL) {
+               goto cleanup;
+       }
+               
+       vs = ldap_get_values(ld, e, mapped.bv_val);
+       if (vs == NULL) {
+               goto cleanup;
+       }
+
+       for ( count = 0; vs[count] != NULL; count++ ) { }
+       v = (BerVarray) ch_calloc( (count + 1), sizeof(struct berval) );
+       if (v == NULL) {
+               goto cleanup;
+       }
+
+       is_oc = (strcasecmp("objectclass", mapped.bv_val) == 0);
+       for ( i = 0, j = 0; i < count; i++) {
+               ber_str2bv(vs[i], 0, 0, &v[j] );
+               if (!is_oc) {
+                       if( v[j].bv_val == NULL )
+                               ch_free(vs[i]);
+                       else
+                               j++;
+               } else {
+                       ldap_back_map(&li->oc_map, &v[j], &mapped, 1);
+                       if (mapped.bv_val) {
+                               ber_dupbv( &v[j], &mapped );
+                               if (v[j].bv_val)
+                                       j++;
                        }
+                       ch_free(vs[i]);
                }
-               ldap_unbind(ld);
-    }
+       }
+       v[j].bv_val = NULL;
+       *vals = v;
+       rc = 0;
+       ch_free(vs);
+       vs = NULL;
+
+cleanup:
+       if (vs) {
+               ldap_value_free(vs);
+       }
+       if (result) {
+               ldap_msgfree(result);
+       }
+       ldap_unbind(ld);
 
        return(rc);
 }