diff options
| author | Jeremy Allison <jra@samba.org> | 2006-03-13 00:05:47 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:15:21 -0500 |
| commit | 1ab0d76f02cd0bc112b4dd026dad5223c9fed3b5 (patch) | |
| tree | 40c8ab4b1431f5a2b2fc1278065eac2e616a11e7 | |
| parent | d245d5c0171c918f2d691160aecde43608bf2264 (diff) | |
| download | samba-1ab0d76f02cd0bc112b4dd026dad5223c9fed3b5.tar.gz samba-1ab0d76f02cd0bc112b4dd026dad5223c9fed3b5.tar.bz2 samba-1ab0d76f02cd0bc112b4dd026dad5223c9fed3b5.zip | |
r14259: Fix coverity #42. Ensure contact_domain can't be null derefed
in error code path.
Jeremy.
(This used to be commit 9f5fcdd8fb437882568e38e174e2df27bd077ba3)
| -rw-r--r-- | source3/nsswitch/winbindd_pam.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c index 754abad9e2..fdc6e07119 100644 --- a/source3/nsswitch/winbindd_pam.c +++ b/source3/nsswitch/winbindd_pam.c @@ -1583,7 +1583,8 @@ void winbindd_pam_chauthtok(struct winbindd_cli_state *state) parse_domain_user(state->request.data.chauthtok.user, domain, user); - if (!(contact_domain = find_domain_from_name(domain))) { + contact_domain = find_domain_from_name(domain); + if (!contact_domain) { DEBUG(3, ("Cannot change password for [%s] -> [%s]\\[%s] as %s is not a trusted domain\n", state->request.data.chauthtok.user, domain, user, domain)); result = NT_STATUS_NO_SUCH_USER; @@ -1650,7 +1651,7 @@ done: } } - if (!NT_STATUS_IS_OK(result) && !got_info) { + if (!NT_STATUS_IS_OK(result) && !got_info && contact_domain) { NTSTATUS policy_ret; @@ -1680,10 +1681,11 @@ process_result: state->response.data.auth.nt_status_string, state->response.data.auth.pam_error)); - if (NT_STATUS_IS_OK(result)) + if (NT_STATUS_IS_OK(result)) { request_ok(state); - else + } else { request_error(state); + } } void winbindd_pam_logoff(struct winbindd_cli_state *state) |