summaryrefslogtreecommitdiff
path: root/source3/winbindd
diff options
context:
space:
mode:
Diffstat (limited to 'source3/winbindd')
-rw-r--r--source3/winbindd/winbindd_ads.c4
-rw-r--r--source3/winbindd/winbindd_pam.c4
-rw-r--r--source3/winbindd/winbindd_rpc.c8
3 files changed, 8 insertions, 8 deletions
diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index 6549c6d7d2..71ce3dd364 100644
--- a/source3/winbindd/winbindd_ads.c
+++ b/source3/winbindd/winbindd_ads.c
@@ -440,8 +440,8 @@ static NTSTATUS query_user(struct winbindd_domain *domain,
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);
- info->full_name = unistr2_tdup(mem_ctx, &user->uni_full_name);
+ 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);
nss_get_info_cached( domain, sid, mem_ctx, NULL, NULL,
&info->homedir, &info->shell, &info->full_name,
diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index 640eb5a519..4b052a8576 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -129,14 +129,14 @@ static NTSTATUS append_unix_username(TALLOC_CTX *mem_ctx,
fstring username_out;
const char *nt_username, *nt_domain;
- if (!(nt_domain = unistr2_tdup(mem_ctx,
+ if (!(nt_domain = unistr2_to_ascii_talloc(mem_ctx,
&info3->uni_logon_dom))) {
/* If the server didn't give us one, just use the one
* we sent them */
nt_domain = name_domain;
}
- if (!(nt_username = unistr2_tdup(mem_ctx,
+ if (!(nt_username = unistr2_to_ascii_talloc(mem_ctx,
&info3->uni_user_name))) {
/* If the server didn't give us one, just use the one
* we sent them */
diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index 55212a84b8..dd45060412 100644
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -436,9 +436,9 @@ static NTSTATUS query_user(struct winbindd_domain *domain,
sid_compose(&user_info->group_sid, &domain->sid,
user->group_rid);
- user_info->acct_name = unistr2_tdup(mem_ctx,
+ user_info->acct_name = unistr2_to_ascii_talloc(mem_ctx,
&user->uni_user_name);
- user_info->full_name = unistr2_tdup(mem_ctx,
+ user_info->full_name = unistr2_to_ascii_talloc(mem_ctx,
&user->uni_full_name);
TALLOC_FREE(user);
@@ -484,9 +484,9 @@ 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_tdup(mem_ctx,
+ user_info->acct_name = unistr2_to_ascii_talloc(mem_ctx,
&ctr->info.id21->uni_user_name);
- user_info->full_name = unistr2_tdup(mem_ctx,
+ user_info->full_name = unistr2_to_ascii_talloc(mem_ctx,
&ctr->info.id21->uni_full_name);
user_info->homedir = NULL;
user_info->shell = NULL;