From 80dca03aaeb0409d866019f52999f69422fb985b Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Sun, 6 May 2007 20:32:36 +0000 Subject: r22711: Fix a compile warnign in query_user(). Ensure that user_rid is initialized. (This used to be commit ef0304268284df7166ecd1b17328076e7ce40de9) --- source3/nsswitch/winbindd_ads.c | 3 +-- source3/nsswitch/winbindd_rpc.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'source3') diff --git a/source3/nsswitch/winbindd_ads.c b/source3/nsswitch/winbindd_ads.c index 1f9748c373..76d12229d9 100644 --- a/source3/nsswitch/winbindd_ads.c +++ b/source3/nsswitch/winbindd_ads.c @@ -461,7 +461,6 @@ static NTSTATUS query_user(struct winbindd_domain *domain, char *sidstr; uint32 group_rid; NTSTATUS status = NT_STATUS_UNSUCCESSFUL; - uint32 user_rid; NET_USER_INFO_3 *user; DEBUG(3,("ads: query_user\n")); @@ -478,7 +477,7 @@ static NTSTATUS query_user(struct winbindd_domain *domain, DEBUG(5,("query_user: Cache lookup succeeded for %s\n", sid_string_static(sid))); - sid_compose(&info->user_sid, &domain->sid, user_rid); + sid_compose(&info->user_sid, &domain->sid, user->user_rid); sid_compose(&info->group_sid, &domain->sid, user->group_rid); info->acct_name = unistr2_tdup(mem_ctx, &user->uni_user_name); diff --git a/source3/nsswitch/winbindd_rpc.c b/source3/nsswitch/winbindd_rpc.c index 0fafff196b..ee8044a667 100644 --- a/source3/nsswitch/winbindd_rpc.c +++ b/source3/nsswitch/winbindd_rpc.c @@ -438,7 +438,7 @@ static NTSTATUS query_user(struct winbindd_domain *domain, DEBUG(5,("query_user: Cache lookup succeeded for %s\n", sid_string_static(user_sid))); - sid_compose(&user_info->user_sid, &domain->sid, user_rid); + sid_compose(&user_info->user_sid, &domain->sid, user->user_rid); sid_compose(&user_info->group_sid, &domain->sid, user->group_rid); -- cgit