LDAP: Add attr_count return value to build_attrs_from_map()

This is necessary because in several places in the code, we are
appending to the attrs returned from this value, and if we relied
on the map size macro, we would be appending after the NULL
terminator if one or more attributes were defined as NULL.

1 files changed, 3 insertions, 1 deletions

diff --git a/src/providers/ldap/sdap.h b/src/providers/ldap/sdap.h
index ba19cbabe..61f899f31 100644
--- a/src/providers/ldap/sdap.h
+++ b/src/providers/ldap/sdap.h
@@ -453,7 +453,9 @@ bool sdap_check_sup_list(struct sup_list *l, const char *val);
 
 int build_attrs_from_map(TALLOC_CTX *memctx,
                          struct sdap_attr_map *map,
-                         size_t size, const char ***_attrs);
+                         size_t size,
+                         const char ***_attrs,
+                         size_t *attr_count);
 
 int sdap_control_create(struct sdap_handle *sh, const char *oid, int iscritical,
                         struct berval *value, int dupval, LDAPControl **ctrlp);