diff options
| author | Stefan Metzmacher <metze@samba.org> | 2010-04-01 09:29:38 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2010-04-16 09:33:28 +0200 |
| commit | edb02e57a3ef83a16bdbd158da4c1290d4ab8240 (patch) | |
| tree | fa685189180d34565abb7a87e56c90cfd0454038 /source3/winbindd | |
| parent | d73fa06540ba1b08815a7b15ce7ef3b14cf668cf (diff) | |
| download | samba-edb02e57a3ef83a16bdbd158da4c1290d4ab8240.tar.gz | |
s3:winbindd: make sure we don't try rpc requests against unaccessable domains
This makes sure we don't crash while trying to dereference domain->conn.cli->foo
while trying to establish a rpc connection to the server.
This fixes bug #7316.
metze
(cherry picked from commit d930904b997d310aeff781bde1e7e3ce47dde8a1)
(cherry picked from commit 01b60b113869f526dcf3bb478d70df21dbb207c8)
Diffstat (limited to 'source3/winbindd')
| -rw-r--r-- | source3/winbindd/winbindd_cm.c | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index 5878a8abe38..670e4941ba3 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -1614,7 +1614,13 @@ static NTSTATUS init_dc_connection_network(struct winbindd_domain *domain) NTSTATUS result; /* Internal connections never use the network. */ - if (domain->internal || !winbindd_can_contact_domain(domain)) { + if (domain->internal) { + domain->initialized = True; + return NT_STATUS_OK; + } + + if (!winbindd_can_contact_domain(domain)) { + invalidate_cm_connection(&domain->conn); domain->initialized = True; return NT_STATUS_OK; } @@ -1647,6 +1653,23 @@ NTSTATUS init_dc_connection(struct winbindd_domain *domain) return init_dc_connection_network(domain); } +static NTSTATUS init_dc_connection_rpc(struct winbindd_domain *domain) +{ + NTSTATUS status; + + status = init_dc_connection(domain); + if (!NT_STATUS_IS_OK(status)) { + return status; + } + + if (!domain->internal && domain->conn.cli == NULL) { + /* happens for trusted domains without inbound trust */ + return NT_STATUS_TRUSTED_DOMAIN_FAILURE; + } + + return NT_STATUS_OK; +} + /****************************************************************************** Set the trust flags (direction and forest location) for a domain ******************************************************************************/ @@ -1993,7 +2016,7 @@ NTSTATUS cm_connect_sam(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, char *machine_account = NULL; char *domain_name = NULL; - result = init_dc_connection(domain); + result = init_dc_connection_rpc(domain); if (!NT_STATUS_IS_OK(result)) { return result; } @@ -2176,7 +2199,7 @@ NTSTATUS cm_connect_lsa_tcp(struct winbindd_domain *domain, DEBUG(10,("cm_connect_lsa_tcp\n")); - status = init_dc_connection(domain); + status = init_dc_connection_rpc(domain); if (!NT_STATUS_IS_OK(status)) { return status; } @@ -2222,7 +2245,7 @@ NTSTATUS cm_connect_lsa(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, NTSTATUS result = NT_STATUS_UNSUCCESSFUL; struct dcinfo *p_dcinfo; - result = init_dc_connection(domain); + result = init_dc_connection_rpc(domain); if (!NT_STATUS_IS_OK(result)) return result; @@ -2354,7 +2377,7 @@ NTSTATUS cm_connect_netlogon(struct winbindd_domain *domain, *cli = NULL; - result = init_dc_connection(domain); + result = init_dc_connection_rpc(domain); if (!NT_STATUS_IS_OK(result)) { return result; } |