summaryrefslogtreecommitdiff
path: root/source3/winbindd/winbindd_ads.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_ads.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_ads.c')
-rw-r--r--source3/winbindd/winbindd_ads.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index db7ceca04d..0900d56987 100644
--- a/source3/winbindd/winbindd_ads.c
+++ b/source3/winbindd/winbindd_ads.c
@@ -421,7 +421,7 @@ static NTSTATUS query_user(struct winbindd_domain *domain,
char *sidstr;
uint32 group_rid;
NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
- NET_USER_INFO_3 *user;
+ struct netr_SamInfo3 *user = NULL;
DEBUG(3,("ads: query_user\n"));
@@ -437,11 +437,11 @@ static NTSTATUS query_user(struct winbindd_domain *domain,
DEBUG(5,("query_user: Cache lookup succeeded for %s\n",
sid_string_dbg(sid)));
- sid_compose(&info->user_sid, &domain->sid, user->user_rid);
- sid_compose(&info->group_sid, &domain->sid, user->group_rid);
+ sid_compose(&info->user_sid, &domain->sid, user->base.rid);
+ sid_compose(&info->group_sid, &domain->sid, user->base.primary_gid);
- info->acct_name = unistr2_to_ascii_talloc(mem_ctx, &user->uni_user_name);
- info->full_name = unistr2_to_ascii_talloc(mem_ctx, &user->uni_full_name);
+ info->acct_name = talloc_strdup(mem_ctx, user->base.account_name.string);
+ info->full_name = talloc_strdup(mem_ctx, user->base.full_name.string);
nss_get_info_cached( domain, sid, mem_ctx, NULL, NULL,
&info->homedir, &info->shell, &info->full_name,