Correctly parse the LDAP dereference control

[abartlet/samba.git/.git] / source4 / libcli / ldap / ldap_controls.c

diff --git a/source4/libcli/ldap/ldap_controls.c b/source4/libcli/ldap/ldap_controls.c
index f4adc50b49a833ead5ac974ea8a0cf058ed522ca..109837c2bf2f155e675fc6dbca9739cdd3bf401a 100644 (file)
--- a/source4/libcli/ldap/ldap_controls.c
+++ b/source4/libcli/ldap/ldap_controls.c
@@ -1136,16 +1136,13 @@ static bool decode_openldap_dereference(void *mem_ctx, DATA_BLOB in, void **out)
 {
        struct asn1_data *data = asn1_init(mem_ctx);
        struct dsdb_openldap_dereference_result_control *control;
-       struct dsdb_openldap_dereference_result **r;
+       struct dsdb_openldap_dereference_result **r = NULL;
        int i = 0;
        if (!data) return false;
 
        control = talloc(mem_ctx, struct dsdb_openldap_dereference_result_control);
        if (!control) return false;
 
-       r = control->attributes = talloc_array(control, struct dsdb_openldap_dereference_result *, 0);
-       if (!r) return false;
-               
        if (!asn1_load(data, in)) {
                return false;
        }
@@ -1160,10 +1157,14 @@ static bool decode_openldap_dereference(void *mem_ctx, DATA_BLOB in, void **out)
        }
 
        while (asn1_tag_remaining(data) > 0) {                                  
-               i++;
-               r = talloc_realloc(r, control, struct dsdb_openldap_dereference_result *, i + 1);
-               
-               r[i] = talloc(r, struct dsdb_openldap_dereference_result);
+               r = talloc_realloc(control, r, struct dsdb_openldap_dereference_result *, i + 2);
+               if (!r) {
+                       return false;
+               }
+               r[i] = talloc_zero(r, struct dsdb_openldap_dereference_result);
+               if (!r[i]) {
+                       return false;
+               }
 
                if (!asn1_start_tag(data, ASN1_SEQUENCE(0))) {
                        return false;
@@ -1171,19 +1172,30 @@ static bool decode_openldap_dereference(void *mem_ctx, DATA_BLOB in, void **out)
                
                asn1_read_OctetString_talloc(r[i], data, &r[i]->source_attribute);
                asn1_read_OctetString_talloc(r[i], data, &r[i]->dereferenced_dn);
-               ldap_decode_attribs(r[i], data, &r[i]->attributes,
-                                   &r[i]->num_attributes);
-               
+               if (asn1_peek_tag(data, ASN1_CONTEXT(0))) {
+                       if (!asn1_start_tag(data, ASN1_CONTEXT(0))) {
+                               return false;
+                       }
+                       
+                       ldap_decode_attribs_bare(r, data, &r[i]->attributes,
+                                                &r[i]->num_attributes);
+                       
+                       if (!asn1_end_tag(data)) {
+                               return false;
+                       }
+               }
                if (!asn1_end_tag(data)) {
                        return false;
                }
-               r[i+1] = NULL;
+               i++;
+               r[i] = NULL;
        }
 
        if (!asn1_end_tag(data)) {
                return false;
        }
 
+       control->attributes = r;
        *out = control;
 
        return true;