diff options
| author | Gerald Carter <jerry@samba.org> | 2003-01-15 17:39:47 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-01-15 17:39:47 +0000 |
| commit | 0e15bf6f6a7200d4b279ea3702f80af6f67199e1 (patch) | |
| tree | e4dc5fba5083e14503723bd6619b2f697a650343 /source3/nsswitch/winbindd_pam.c | |
| parent | 4242eda183393b0535ac8ef880b4f441c60137af (diff) | |
| download | samba-0e15bf6f6a7200d4b279ea3702f80af6f67199e1.tar.gz samba-0e15bf6f6a7200d4b279ea3702f80af6f67199e1.tar.bz2 samba-0e15bf6f6a7200d4b279ea3702f80af6f67199e1.zip | |
winbindd merges from HEAD
(This used to be commit 8bd91a50d4e743935196ca258d06a3e43392140d)
Diffstat (limited to 'source3/nsswitch/winbindd_pam.c')
| -rw-r--r-- | source3/nsswitch/winbindd_pam.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c index 81c182315f..f3237f08da 100644 --- a/source3/nsswitch/winbindd_pam.c +++ b/source3/nsswitch/winbindd_pam.c @@ -142,7 +142,7 @@ done: state->response.data.auth.nt_status = NT_STATUS_V(result); fstrcpy(state->response.data.auth.nt_status_string, nt_errstr(result)); - fstrcpy(state->response.data.auth.error_string, nt_errstr(result)); + fstrcpy(state->response.data.auth.error_string, get_friendly_nt_error_msg(result)); state->response.data.auth.pam_error = nt_status_to_pam(result); DEBUG(NT_STATUS_IS_OK(result) ? 5 : 2, ("Plain-text authentication for user %s returned %s (PAM: %d)\n", @@ -273,6 +273,8 @@ enum winbindd_result winbindd_pam_auth_crap(struct winbindd_cli_state *state) #if 0 /* we don't currently do this stuff right */ + /* Doing an assert in a daemon is going to be a pretty bad + idea. - tpot */ if (state->request.data.auth_crap.flags & WINBIND_PAM_NTKEY) { SMB_ASSERT(sizeof(state->response.data.auth.nt_session_key) == sizeof(info3.user_sess_key)); memcpy(state->response.data.auth.nt_session_key, info3.user_sess_key, sizeof(state->response.data.auth.nt_session_key) /* 16 */); |