From ca4b7b92738f3dd463914e3de5757cd98d37a983 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 8 May 2012 13:37:14 -0400 Subject: 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. --- src/providers/ldap/ldap_id.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/providers/ldap/ldap_id.c') diff --git a/src/providers/ldap/ldap_id.c b/src/providers/ldap/ldap_id.c index 18635869..bdd640a9 100644 --- a/src/providers/ldap/ldap_id.c +++ b/src/providers/ldap/ldap_id.c @@ -152,7 +152,7 @@ struct tevent_req *users_get_send(TALLOC_CTX *memctx, /* TODO: handle attrs_type */ ret = build_attrs_from_map(state, ctx->opts->user_map, - SDAP_OPTS_USER, &state->attrs); + SDAP_OPTS_USER, &state->attrs, NULL); if (ret != EOK) goto fail; ret = users_get_retry(req); @@ -440,7 +440,7 @@ struct tevent_req *groups_get_send(TALLOC_CTX *memctx, /* TODO: handle attrs_type */ ret = build_attrs_from_map(state, ctx->opts->group_map, - SDAP_OPTS_GROUP, &state->attrs); + SDAP_OPTS_GROUP, &state->attrs, NULL); if (ret != EOK) goto fail; ret = groups_get_retry(req); @@ -632,7 +632,7 @@ static struct tevent_req *groups_by_user_send(TALLOC_CTX *memctx, state->name = name; ret = build_attrs_from_map(state, ctx->opts->group_map, - SDAP_OPTS_GROUP, &state->attrs); + SDAP_OPTS_GROUP, &state->attrs, NULL); if (ret != EOK) goto fail; ret = groups_by_user_retry(req); -- cgit