diff options
| author | Jeremy Allison <jra@samba.org> | 2010-08-23 13:05:56 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-08-23 16:53:45 -0700 |
| commit | 33060f67be100836d381a74bced351c6579cc58d (patch) | |
| tree | 976ee54e2a0fdedf56c68f434e7024abf57a47d9 | |
| parent | a782a80d2f5e70d40708bd578a1f456c451d2979 (diff) | |
| download | samba-33060f67be100836d381a74bced351c6579cc58d.tar.gz samba-33060f67be100836d381a74bced351c6579cc58d.tar.bz2 samba-33060f67be100836d381a74bced351c6579cc58d.zip | |
Final part of fix for bug #7636 - winbind internal error, backtrace.
Ensure cm_get_schannel_creds() returns NTSTATUS.
Jeremy.
| -rw-r--r-- | source3/winbindd/winbindd_cm.c | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index 958daf794e..fca0a9162c 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -2044,30 +2044,30 @@ static void set_dc_type_and_flags( struct winbindd_domain *domain ) /********************************************************************** ***********************************************************************/ -static bool cm_get_schannel_creds(struct winbindd_domain *domain, +static NTSTATUS cm_get_schannel_creds(struct winbindd_domain *domain, struct netlogon_creds_CredentialState **ppdc) { - NTSTATUS result; + NTSTATUS result = NT_STATUS_UNSUCCESSFUL; struct rpc_pipe_client *netlogon_pipe; if (lp_client_schannel() == False) { - return False; + return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;; } result = cm_connect_netlogon(domain, &netlogon_pipe); if (!NT_STATUS_IS_OK(result)) { - return False; + return result; } /* Return a pointer to the struct netlogon_creds_CredentialState from the netlogon pipe. */ if (!domain->conn.netlogon_pipe->dc) { - return false; + return NT_STATUS_INTERNAL_ERROR; /* This shouldn't happen. */ } *ppdc = domain->conn.netlogon_pipe->dc; - return True; + return NT_STATUS_OK; } NTSTATUS cm_connect_sam(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, @@ -2172,10 +2172,13 @@ NTSTATUS cm_connect_sam(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, /* Fall back to schannel if it's a W2K pre-SP1 box. */ - if (!cm_get_schannel_creds(domain, &p_creds)) { + result = cm_get_schannel_creds(domain, &p_creds); + if (!NT_STATUS_IS_OK(result)) { /* If this call fails - conn->cli can now be NULL ! */ DEBUG(10, ("cm_connect_sam: Could not get schannel auth info " - "for domain %s, trying anon\n", domain->name)); + "for domain %s (error %s), trying anon\n", + domain->name, + nt_errstr(result) )); goto anonymous; } result = cli_rpc_pipe_open_schannel_with_key @@ -2288,7 +2291,8 @@ NTSTATUS cm_connect_lsa_tcp(struct winbindd_domain *domain, TALLOC_FREE(conn->lsa_pipe_tcp); - if (!cm_get_schannel_creds(domain, &creds)) { + status = cm_get_schannel_creds(domain, &creds); + if (!NT_STATUS_IS_OK(status)) { goto done; } @@ -2380,10 +2384,13 @@ NTSTATUS cm_connect_lsa(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, /* Fall back to schannel if it's a W2K pre-SP1 box. */ - if (!cm_get_schannel_creds(domain, &p_creds)) { + result = cm_get_schannel_creds(domain, &p_creds); + if (!NT_STATUS_IS_OK(result)) { /* If this call fails - conn->cli can now be NULL ! */ DEBUG(10, ("cm_connect_lsa: Could not get schannel auth info " - "for domain %s, trying anon\n", domain->name)); + "for domain %s (error %s), trying anon\n", + domain->name, + nt_errstr(result) )); goto anonymous; } result = cli_rpc_pipe_open_schannel_with_key |