diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-04-16 16:11:17 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-04-16 16:11:17 +0200 |
| commit | a58df2f54c5847a6a3dddad51465c319f1c387f5 (patch) | |
| tree | 11e3474ff36f5b8ea31faf73e40daf64db8c9688 /source4 | |
| parent | 008c8adfe3c72b4820d22421ba3df8dc80053831 (diff) | |
| download | samba-a58df2f54c5847a6a3dddad51465c319f1c387f5.tar.gz samba-a58df2f54c5847a6a3dddad51465c319f1c387f5.tar.bz2 samba-a58df2f54c5847a6a3dddad51465c319f1c387f5.zip | |
Fix struct_based winbind test for 'check machine account'.
The problem here was that we did not fill in the error strings in the
success case, and the testsuite checked against the incorrect
'freindly' error string.
Andrew Bartlett
(This used to be commit df05f118831245bdb19573711545bdb1b01a0c50)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/torture/winbind/struct_based.c | 2 | ||||
| -rw-r--r-- | source4/winbind/wb_samba3_cmd.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/source4/torture/winbind/struct_based.c b/source4/torture/winbind/struct_based.c index 51ac0e622a..f9e4e148c3 100644 --- a/source4/torture/winbind/struct_based.c +++ b/source4/torture/winbind/struct_based.c @@ -262,7 +262,7 @@ static bool torture_winbind_struct_check_machacc(struct torture_context *torture torture_assert_str_equal(torture, rep.data.auth.error_string, - nt_errstr(NT_STATUS_OK), + get_friendly_nt_error_msg(NT_STATUS_OK), "WINBINDD_CHECK_MACHACC ok: error_string"); torture_assert_int_equal(torture, diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c index 8ae330df35..7f1520a3b3 100644 --- a/source4/winbind/wb_samba3_cmd.c +++ b/source4/winbind/wb_samba3_cmd.c @@ -43,13 +43,14 @@ static void wbsrv_samba3_async_auth_epilogue(NTSTATUS status, struct winbindd_response *resp = &s3call->response; if (!NT_STATUS_IS_OK(status)) { resp->result = WINBINDD_ERROR; - WBSRV_SAMBA3_SET_STRING(resp->data.auth.nt_status_string, - nt_errstr(status)); - WBSRV_SAMBA3_SET_STRING(resp->data.auth.error_string, - get_friendly_nt_error_msg(status)); } else { resp->result = WINBINDD_OK; } + + WBSRV_SAMBA3_SET_STRING(resp->data.auth.nt_status_string, + nt_errstr(status)); + WBSRV_SAMBA3_SET_STRING(resp->data.auth.error_string, + get_friendly_nt_error_msg(status)); resp->data.auth.pam_error = nt_status_to_pam(status); resp->data.auth.nt_status = NT_STATUS_V(status); |