diff options
| author | Günther Deschner <gd@samba.org> | 2008-02-12 18:13:30 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2008-02-12 18:16:56 +0100 |
| commit | 4c42f7999a876db0ec7e93f60354ef51290ad11e (patch) | |
| tree | d7c58ec6e8443c1442a122e44c2243a832d22ca9 /source3/winbindd/winbindd_rpc.c | |
| parent | 8823c7453df635357bff14ca725c139a1d92f5ef (diff) | |
| download | samba-4c42f7999a876db0ec7e93f60354ef51290ad11e.tar.gz samba-4c42f7999a876db0ec7e93f60354ef51290ad11e.tar.bz2 samba-4c42f7999a876db0ec7e93f60354ef51290ad11e.zip | |
Use rpccli_samr_QueryUserInfo in net and winbindd.
Guenther
(This used to be commit a9ff6760901a489ff8877717bdd5a2218154498f)
Diffstat (limited to 'source3/winbindd/winbindd_rpc.c')
| -rw-r--r-- | source3/winbindd/winbindd_rpc.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c index fa9c1bc58d..2703f2f64a 100644 --- a/source3/winbindd/winbindd_rpc.c +++ b/source3/winbindd/winbindd_rpc.c @@ -409,7 +409,7 @@ static NTSTATUS query_user(struct winbindd_domain *domain, { NTSTATUS result = NT_STATUS_UNSUCCESSFUL; POLICY_HND dom_pol, user_pol; - SAM_USERINFO_CTR *ctr; + union samr_UserInfo *info = NULL; uint32 user_rid; NET_USER_INFO_3 *user; struct rpc_pipe_client *cli; @@ -480,8 +480,10 @@ static NTSTATUS query_user(struct winbindd_domain *domain, return result; /* Get user info */ - result = rpccli_samr_query_userinfo(cli, mem_ctx, &user_pol, - 0x15, &ctr); + result = rpccli_samr_QueryUserInfo(cli, mem_ctx, + &user_pol, + 0x15, + &info); rpccli_samr_Close(cli, mem_ctx, &user_pol); @@ -490,11 +492,11 @@ static NTSTATUS query_user(struct winbindd_domain *domain, sid_compose(&user_info->user_sid, &domain->sid, user_rid); sid_compose(&user_info->group_sid, &domain->sid, - ctr->info.id21->group_rid); - user_info->acct_name = unistr2_to_ascii_talloc(mem_ctx, - &ctr->info.id21->uni_user_name); - user_info->full_name = unistr2_to_ascii_talloc(mem_ctx, - &ctr->info.id21->uni_full_name); + info->info21.primary_gid); + user_info->acct_name = talloc_strdup(mem_ctx, + info->info21.account_name.string); + user_info->full_name = talloc_strdup(mem_ctx, + info->info21.full_name.string); user_info->homedir = NULL; user_info->shell = NULL; user_info->primary_gid = (gid_t)-1; |