summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2007-05-06 20:32:36 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:21:49 -0500
commit80dca03aaeb0409d866019f52999f69422fb985b (patch)
treea3de7cc9f2c6acd7f78f42e83b1ff062b27367bc
parent391a72f3dfc061d6d97752c7e8691f80b4990ba8 (diff)
downloadsamba-80dca03aaeb0409d866019f52999f69422fb985b.tar.gz
samba-80dca03aaeb0409d866019f52999f69422fb985b.tar.bz2
samba-80dca03aaeb0409d866019f52999f69422fb985b.zip
r22711: Fix a compile warnign in query_user(). Ensure that user_rid
is initialized. (This used to be commit ef0304268284df7166ecd1b17328076e7ce40de9)
-rw-r--r--source3/nsswitch/winbindd_ads.c3
-rw-r--r--source3/nsswitch/winbindd_rpc.c2
2 files changed, 2 insertions, 3 deletions
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);