diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-12-30 22:27:33 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-12-30 22:27:33 +0000 |
| commit | bcd0e51e280b45e489b1111d730097816dbcaa23 (patch) | |
| tree | 17d0c065db5e0250f3f3964c8c55df5a5cc12fab /source3 | |
| parent | 318190580d4248385f4d03a8d1408a9162c588f0 (diff) | |
| download | samba-bcd0e51e280b45e489b1111d730097816dbcaa23.tar.gz samba-bcd0e51e280b45e489b1111d730097816dbcaa23.tar.bz2 samba-bcd0e51e280b45e489b1111d730097816dbcaa23.zip | |
Get the DOMAIN\username around the right way (I had username\domain...)
Push the unix username into utf8 for it's trip across the socket.
Andrew Bartlett
(This used to be commit 3225f262b18bdcf326d3bfd031dac169bd9347c9)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/nsswitch/winbindd_pam.c | 6 | ||||
| -rw-r--r-- | source3/utils/ntlm_auth.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c index 7c4cb53dbf..94f9bf9464 100644 --- a/source3/nsswitch/winbindd_pam.c +++ b/source3/nsswitch/winbindd_pam.c @@ -382,12 +382,12 @@ enum winbindd_result winbindd_pam_auth_crap(struct winbindd_cli_state *state) nt_domain = domain; } - fill_domain_username(username_out, nt_username, nt_domain); + fill_domain_username(username_out, nt_domain, nt_username); DEBUG(5, ("Setting unix username to [%s]\n", username_out)); - state->response.extra_data = strdup(username_out); - if (!state->response.extra_data) { + /* this interface is in UTF8 */ + if (push_utf8_allocate((char **)&state->response.extra_data, username_out) == -1) { result = NT_STATUS_NO_MEMORY; goto done; } diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c index bef10b52b3..96e52964b4 100644 --- a/source3/utils/ntlm_auth.c +++ b/source3/utils/ntlm_auth.c @@ -305,7 +305,9 @@ static NTSTATUS contact_winbind_auth_crap(const char *username, } if (flags & WBFLAG_PAM_UNIX_NAME) { - *unix_name = response.extra_data; + if (pull_utf8_allocate(unix_name, (char *)response.extra_data) == -1) { + return NT_STATUS_NO_MEMORY; + } } return nt_status; |