sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

Fix a warning about a shadowed variable by renaming the shadowing var

Browse Source 
Signed-off-by: Matthieu Patou <mat@matws.net>

Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Matthieu Patou 2013-05-17 05:17:41 -07:00 committed by Andrew Bartlett
parent e1b71f1c13
commit bfce9690bf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source4/libnet/libnet_samsync_ldb.c
View File

@ -665,7 +665,7 @@ static NTSTATUS samsync_ldb_handle_group_member(TALLOC_CTX *mem_ctx,
char **error_string) char **error_string)
{ {
uint32_t rid = delta->delta_id_union.rid; uint32_t rid = delta->delta_id_union.rid;
struct netr_DELTA_GROUP_MEMBER *group_member = delta->delta_union.group_member; struct netr_DELTA_GROUP_MEMBER *delta_group_member = delta->delta_union.group_member;
struct ldb_message *msg; struct ldb_message *msg;
struct ldb_message **msgs; struct ldb_message **msgs;
int ret; int ret;
@ -701,11 +701,11 @@ static NTSTATUS samsync_ldb_handle_group_member(TALLOC_CTX *mem_ctx,
talloc_free(msgs); talloc_free(msgs);
for (i=0; i<group_member->num_rids; i++) { for (i=0; i<delta_group_member->num_rids; i++) {
/* search for the group, by rid */ /* search for the group, by rid */
ret = gendb_search(state->sam_ldb, mem_ctx, state->base_dn[database], &msgs, attrs, ret = gendb_search(state->sam_ldb, mem_ctx, state->base_dn[database], &msgs, attrs,
"(&(objectClass=user)(objectSid=%s))", "(&(objectClass=user)(objectSid=%s))",
ldap_encode_ndr_dom_sid(mem_ctx, dom_sid_add_rid(mem_ctx, state->dom_sid[database], group_member->rids[i]))); ldap_encode_ndr_dom_sid(mem_ctx, dom_sid_add_rid(mem_ctx, state->dom_sid[database], delta_group_member->rids[i])));
if (ret == -1) { if (ret == -1) {
*error_string = talloc_asprintf(mem_ctx, "gendb_search failed: %s", ldb_errstring(state->sam_ldb)); *error_string = talloc_asprintf(mem_ctx, "gendb_search failed: %s", ldb_errstring(state->sam_ldb));