summaryrefslogtreecommitdiff
path: root/source3/winbindd/winbindd_rpc.c
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-02-17 02:08:12 +0100
committerGünther Deschner <gd@samba.org>2008-02-17 02:12:00 +0100
commitc25958a046bbcfc13db200430e505ac4ee9b3f27 (patch)
tree17dee3afcae407131dd3f88393d578b0e3d132bb /source3/winbindd/winbindd_rpc.c
parentc35ae5943d5622351f447a5c2a1311c05d4af0c7 (diff)
downloadsamba-c25958a046bbcfc13db200430e505ac4ee9b3f27.tar.gz
samba-c25958a046bbcfc13db200430e505ac4ee9b3f27.tar.bz2
samba-c25958a046bbcfc13db200430e505ac4ee9b3f27.zip
Use netr_SamInfo3 everywhere in winbindd.
Guenther (This used to be commit d9502eb75395131d5a8130ff2c4ebace106cb974)
Diffstat (limited to 'source3/winbindd/winbindd_rpc.c')
-rw-r--r--source3/winbindd/winbindd_rpc.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index 585923410f..f818772ce7 100644
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -429,7 +429,7 @@ static NTSTATUS query_user(struct winbindd_domain *domain,
POLICY_HND dom_pol, user_pol;
union samr_UserInfo *info = NULL;
uint32 user_rid;
- NET_USER_INFO_3 *user;
+ struct netr_SamInfo3 *user;
struct rpc_pipe_client *cli;
DEBUG(3,("rpc: query_user sid=%s\n", sid_string_dbg(user_sid)));
@@ -449,14 +449,14 @@ static NTSTATUS query_user(struct winbindd_domain *domain,
DEBUG(5,("query_user: Cache lookup succeeded for %s\n",
sid_string_dbg(user_sid)));
- sid_compose(&user_info->user_sid, &domain->sid, user->user_rid);
+ sid_compose(&user_info->user_sid, &domain->sid, user->base.rid);
sid_compose(&user_info->group_sid, &domain->sid,
- user->group_rid);
+ user->base.primary_gid);
- user_info->acct_name = unistr2_to_ascii_talloc(mem_ctx,
- &user->uni_user_name);
- user_info->full_name = unistr2_to_ascii_talloc(mem_ctx,
- &user->uni_full_name);
+ user_info->acct_name = talloc_strdup(mem_ctx,
+ user->base.account_name.string);
+ user_info->full_name = talloc_strdup(mem_ctx,
+ user->base.full_name.string);
TALLOC_FREE(user);