diff options
| author | Jeremy Allison <jra@samba.org> | 2007-11-27 14:35:30 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-11-27 14:35:30 -0800 |
| commit | 6b6655edd90850d09c7711fc3b9fe98271e3e625 (patch) | |
| tree | fd0247dcf84688d1f6bdba2253d05f6dd0fe0787 /source3/winbindd | |
| parent | f642ae837507e755d5949a61ea5ad70c7b334385 (diff) | |
| download | samba-6b6655edd90850d09c7711fc3b9fe98271e3e625.tar.gz samba-6b6655edd90850d09c7711fc3b9fe98271e3e625.tar.bz2 samba-6b6655edd90850d09c7711fc3b9fe98271e3e625.zip | |
Remove pstrings from everything except srv_spoolss_nt.c.
Jeremy.
(This used to be commit 0002a9e96b0ef78316295a6eb94ff29b64e2f988)
Diffstat (limited to 'source3/winbindd')
| -rw-r--r-- | source3/winbindd/winbindd_ads.c | 4 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_pam.c | 4 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_rpc.c | 8 |
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; |