r22711: Fix a compile warnign in query_user(). Ensure that user_rid

is initialized.
(This used to be commit ef0304268284df7166ecd1b17328076e7ce40de9)

diff --git a/source3/nsswitch/winbindd_ads.c b/source3/nsswitch/winbindd_ads.c
index 1f9748c37319306b67c9db2b50da9b951c42cc15..76d12229d963ecd3035ae0181b58e5bb236d887d 100644 (file)
--- 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 0fafff196b38efd9d900b32fe26275ddc3f5e4d5..ee8044a6678b9a7eb8fd777b0a1cb0768ae1c843 100644 (file)
--- 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);