diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-12-16 09:45:15 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-12-18 06:47:40 +0100 |
| commit | c5b54ea1adb14b04e10cd4fa509345fe78942a75 (patch) | |
| tree | 2d180a09c9cfac94f5472934795d1fbf31d768bc | |
| parent | 12aaafd2971ac71823ccbebda7b2afd689239770 (diff) | |
| download | samba-c5b54ea1adb14b04e10cd4fa509345fe78942a75.tar.gz samba-c5b54ea1adb14b04e10cd4fa509345fe78942a75.tar.xz samba-c5b54ea1adb14b04e10cd4fa509345fe78942a75.zip | |
s3:libsmb: let cli_session_setup_kerberos_recv() return a useful error code
Forcing NT_STATUS_UNSUCCESSFUL is not a good idea, we should return
NT_STATUS_LOGON_FAILURE instead.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=11010
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source3/libsmb/cliconnect.c | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index 2b1e2ecb88..7a9e64834c 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -1302,11 +1302,18 @@ static struct tevent_req *cli_session_setup_kerberos_send( rc = spnego_gen_krb5_negTokenInit(state, principal, 0, &state->negTokenTarg, &state->session_key_krb5, 0, NULL, NULL); if (rc) { - DEBUG(1, ("cli_session_setup_kerberos: " - "spnego_gen_krb5_negTokenInit failed: %s\n", - error_message(rc))); + NTSTATUS status; + state->ads_status = ADS_ERROR_KRB5(rc); - tevent_req_nterror(req, NT_STATUS_UNSUCCESSFUL); + status = ads_ntstatus(state->ads_status); + if (NT_STATUS_EQUAL(status, NT_STATUS_UNSUCCESSFUL)) { + status = NT_STATUS_LOGON_FAILURE; + state->ads_status = ADS_ERROR_NT(status); + } + DEBUG(1, ("cli_session_setup_kerberos: " + "spnego_gen_krb5_negTokenInit failed: %s - %s\n", + error_message(rc), nt_errstr(status))); + tevent_req_nterror(req, status); return tevent_req_post(req, ev); } @@ -1384,9 +1391,18 @@ static ADS_STATUS cli_session_setup_kerberos_recv(struct tevent_req *req) NTSTATUS status; if (tevent_req_is_nterror(req, &status)) { - return ADS_ERROR_NT(status); + ADS_STATUS ads = state->ads_status; + + if (!ADS_ERR_OK(state->ads_status)) { + ads = state->ads_status; + } else { + ads = ADS_ERROR_NT(status); + } + tevent_req_received(req); + return ads; } - return state->ads_status; + tevent_req_received(req); + return ADS_SUCCESS; } #endif /* HAVE_KRB5 */ |