diff options
| author | Matthieu Patou <mat@matws.net> | 2013-05-17 05:17:41 -0700 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2013-05-20 21:54:06 +1000 |
| commit | bfce9690bf6e6592d32dd41642a33cbe3c027b81 (patch) | |
| tree | 0f2b0df87ec34a7f265a37ff4f9285a2f5062747 /source4/libnet/libnet_samsync_ldb.c | |
| parent | e1b71f1c133fd43935135a44cdbbb7e912ff4279 (diff) | |
| download | samba-bfce9690bf6e6592d32dd41642a33cbe3c027b81.tar.gz samba-bfce9690bf6e6592d32dd41642a33cbe3c027b81.tar.bz2 samba-bfce9690bf6e6592d32dd41642a33cbe3c027b81.zip | |
Fix a warning about a shadowed variable by renaming the shadowing var
Signed-off-by: Matthieu Patou <mat@matws.net>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/libnet/libnet_samsync_ldb.c')
| -rw-r--r-- | source4/libnet/libnet_samsync_ldb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/libnet/libnet_samsync_ldb.c b/source4/libnet/libnet_samsync_ldb.c index ccf737f64c..10e5a34da4 100644 --- a/source4/libnet/libnet_samsync_ldb.c +++ b/source4/libnet/libnet_samsync_ldb.c @@ -665,7 +665,7 @@ static NTSTATUS samsync_ldb_handle_group_member(TALLOC_CTX *mem_ctx, char **error_string) { 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 **msgs; int ret; @@ -701,11 +701,11 @@ static NTSTATUS samsync_ldb_handle_group_member(TALLOC_CTX *mem_ctx, 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 */ ret = gendb_search(state->sam_ldb, mem_ctx, state->base_dn[database], &msgs, attrs, "(&(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) { *error_string = talloc_asprintf(mem_ctx, "gendb_search failed: %s", ldb_errstring(state->sam_ldb)); |