Merge branch 'master' of git://git.samba.org/samba

3 files changed, 384 insertions, 13 deletions

diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index ddbd9d9d5b..68972dd18d 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -1380,6 +1380,7 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
 	struct cache_entry *centry = NULL;
 	NTSTATUS status;
 	unsigned int i, retry;
+	bool old_status = domain->online;
 
 	if (!cache->tdb)
 		goto do_query;
@@ -1388,6 +1389,7 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
 	if (!centry)
 		goto do_query;
 
+do_fetch_cache:
 	*num_entries = centry_uint32(centry);
 
 	if (*num_entries == 0)
@@ -1448,12 +1450,44 @@ do_query:
 				  "connection cache\n"));
 			invalidate_cm_connection(&domain->conn);
 		}
+		if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT) ||
+		    NT_STATUS_EQUAL(status, NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND)) {
+			if (!domain->internal && old_status) {
+				set_domain_offline(domain);
+			}
+			/* store partial response. */
+			if (*num_entries > 0) {
+				/*
+				 * humm, what about the status used for cache?
+				 * Should it be NT_STATUS_OK?
+				 */
+				break;
+			}
+			/*
+			 * domain is offline now, and there is no user entries,
+			 * try to fetch from cache again.
+			 */
+			if (cache->tdb && !domain->online && !domain->internal && old_status) {
+				centry = wcache_fetch(cache, domain, "UL/%s", domain->name);
+				/* partial response... */
+				if (!centry) {
+					goto skip_save;
+				} else {
+					goto do_fetch_cache;
+				}
+			} else {
+				goto skip_save;
+			}
+		}
 
 	} while (NT_STATUS_V(status) == NT_STATUS_V(NT_STATUS_UNSUCCESSFUL) && 
 		 (retry++ < 5));
 
 	/* and save it */
 	refresh_sequence_number(domain, false);
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
+	}
 	centry = centry_start(domain, status);
 	if (!centry)
 		goto skip_save;
@@ -1497,7 +1531,9 @@ static NTSTATUS enum_dom_groups(struct winbindd_domain *domain,
 	struct cache_entry *centry = NULL;
 	NTSTATUS status;
 	unsigned int i;
+	bool old_status;
 
+	old_status = domain->online;
 	if (!cache->tdb)
 		goto do_query;
 
@@ -1505,6 +1541,7 @@ static NTSTATUS enum_dom_groups(struct winbindd_domain *domain,
 	if (!centry)
 		goto do_query;
 
+do_fetch_cache:
 	*num_entries = centry_uint32(centry);
 
 	if (*num_entries == 0)
@@ -1543,8 +1580,26 @@ do_query:
 
 	status = domain->backend->enum_dom_groups(domain, mem_ctx, num_entries, info);
 
+	if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT) ||
+	    NT_STATUS_EQUAL(status, NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND)) {
+		if (!domain->internal && old_status) {
+			set_domain_offline(domain);
+		}
+		if (cache->tdb &&
+			!domain->online &&
+			!domain->internal &&
+			old_status) {
+			centry = wcache_fetch(cache, domain, "GL/%s/domain", domain->name);
+			if (centry) {
+				goto do_fetch_cache;
+			}
+		}
+	}
 	/* and save it */
 	refresh_sequence_number(domain, false);
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
+	}
 	centry = centry_start(domain, status);
 	if (!centry)
 		goto skip_save;
@@ -1571,7 +1626,9 @@ static NTSTATUS enum_local_groups(struct winbindd_domain *domain,
 	struct cache_entry *centry = NULL;
 	NTSTATUS status;
 	unsigned int i;
+	bool old_status;
 
+	old_status = domain->online;
 	if (!cache->tdb)
 		goto do_query;
 
@@ -1579,6 +1636,7 @@ static NTSTATUS enum_local_groups(struct winbindd_domain *domain,
 	if (!centry)
 		goto do_query;
 
+do_fetch_cache:
 	*num_entries = centry_uint32(centry);
 
 	if (*num_entries == 0)
@@ -1627,8 +1685,26 @@ do_query:
 
 	status = domain->backend->enum_local_groups(domain, mem_ctx, num_entries, info);
 
+	if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT) ||
+		NT_STATUS_EQUAL(status, NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND)) {
+		if (!domain->internal && old_status) {
+			set_domain_offline(domain);
+		}
+		if (cache->tdb &&
+			!domain->internal &&
+			!domain->online &&
+			old_status) {
+			centry = wcache_fetch(cache, domain, "GL/%s/local", domain->name);
+			if (centry) {
+				goto do_fetch_cache;
+			}
+		}
+	}
 	/* and save it */
 	refresh_sequence_number(domain, false);
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
+	}
 	centry = centry_start(domain, status);
 	if (!centry)
 		goto skip_save;
@@ -1694,6 +1770,9 @@ static NTSTATUS name_to_sid(struct winbindd_domain *domain,
 			    enum lsa_SidType *type)
 {
 	NTSTATUS status;
+	bool old_status;
+
+	old_status = domain->online;
 
 	status = wcache_name_to_sid(domain, domain_name, name, sid, type);
 	if (!NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
@@ -1719,6 +1798,19 @@ static NTSTATUS name_to_sid(struct winbindd_domain *domain,
 	status = domain->backend->name_to_sid(domain, mem_ctx, domain_name,
 					      name, flags, sid, type);
 
+	if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT) ||
+		NT_STATUS_EQUAL(status, NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND)) {
+		if (!domain->internal && old_status) {
+			set_domain_offline(domain);
+		}
+		if (!domain->internal &&
+			!domain->online &&
+			old_status) {
+			NTSTATUS cache_status;
+			cache_status = wcache_name_to_sid(domain, domain_name, name, sid, type);
+			return cache_status;
+		}
+	}
 	/* and save it */
 	refresh_sequence_number(domain, false);
 
@@ -1789,7 +1881,9 @@ static NTSTATUS sid_to_name(struct winbindd_domain *domain,
 			    enum lsa_SidType *type)
 {
 	NTSTATUS status;
+	bool old_status;
 
+	old_status = domain->online;
 	status = wcache_sid_to_name(domain, sid, mem_ctx, domain_name, name,
 				    type);
 	if (!NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
@@ -1815,8 +1909,25 @@ static NTSTATUS sid_to_name(struct winbindd_domain *domain,
 
 	status = domain->backend->sid_to_name(domain, mem_ctx, sid, domain_name, name, type);
 
+	if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT) ||
+		NT_STATUS_EQUAL(status, NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND)) {
+		if (!domain->internal && old_status) {
+			set_domain_offline(domain);
+		}
+		if (!domain->internal &&
+			!domain->online &&
+			old_status) {
+			NTSTATUS cache_status;
+			cache_status = wcache_sid_to_name(domain, sid, mem_ctx,
+							domain_name, name, type);
+			return cache_status;
+		}
+	}
 	/* and save it */
 	refresh_sequence_number(domain, false);
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
+	}
 	wcache_save_sid_to_name(domain, status, sid, *domain_name, *name, *type);
 
 	/* We can't save the name to sid mapping here, as with sid history a
@@ -1839,7 +1950,9 @@ static NTSTATUS rids_to_names(struct winbindd_domain *domain,
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	bool have_mapped;
 	bool have_unmapped;
+	bool old_status;
 
+	old_status = domain->online;
 	*domain_name = NULL;
 	*names = NULL;
 	*types = NULL;
@@ -1924,6 +2037,73 @@ static NTSTATUS rids_to_names(struct winbindd_domain *domain,
 						rids, num_rids, domain_name,
 						names, types);
 
+	if (NT_STATUS_EQUAL(result, NT_STATUS_IO_TIMEOUT) ||
+		NT_STATUS_EQUAL(result, NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND)) {
+		if (!domain->internal && old_status) {
+			set_domain_offline(domain);
+		}
+		if (cache->tdb &&
+			!domain->internal &&
+			!domain->online &&
+			old_status) {
+			have_mapped = have_unmapped = false;
+
+			for (i=0; i<num_rids; i++) {
+				DOM_SID sid;
+				struct cache_entry *centry;
+				fstring tmp;
+
+				if (!sid_compose(&sid, domain_sid, rids[i])) {
+					result = NT_STATUS_INTERNAL_ERROR;
+					goto error;
+				}
+
+				centry = wcache_fetch(cache, domain, "SN/%s",
+						      sid_to_fstring(tmp, &sid));
+				if (!centry) {
+					(*types)[i] = SID_NAME_UNKNOWN;
+					(*names)[i] = talloc_strdup(*names, "");
+					continue;
+				}
+
+				(*types)[i] = SID_NAME_UNKNOWN;
+				(*names)[i] = talloc_strdup(*names, "");
+
+				if (NT_STATUS_IS_OK(centry->status)) {
+					char *dom;
+					have_mapped = true;
+					(*types)[i] = (enum lsa_SidType)centry_uint32(centry);
+
+					dom = centry_string(centry, mem_ctx);
+					if (*domain_name == NULL) {
+						*domain_name = dom;
+					} else {
+						talloc_free(dom);
+					}
+
+					(*names)[i] = centry_string(centry, *names);
+
+				} else if (NT_STATUS_EQUAL(centry->status, NT_STATUS_NONE_MAPPED)) {
+					have_unmapped = true;
+
+				} else {
+					/* something's definitely wrong */
+					result = centry->status;
+					goto error;
+				}
+
+				centry_free(centry);
+			}
+
+			if (!have_mapped) {
+				return NT_STATUS_NONE_MAPPED;
+			}
+			if (!have_unmapped) {
+				return NT_STATUS_OK;
+			}
+			return STATUS_SOME_UNMAPPED;
+		}
+	}
 	/*
 	  None of the queried rids has been found so save all negative entries
 	*/
@@ -2046,7 +2226,9 @@ static NTSTATUS query_user(struct winbindd_domain *domain,
 			   struct wbint_userinfo *info)
 {
 	NTSTATUS status;
+	bool old_status;
 
+	old_status = domain->online;
 	status = wcache_query_user(domain, mem_ctx, user_sid, info);
 	if (!NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
 		return status;
@@ -2064,8 +2246,24 @@ static NTSTATUS query_user(struct winbindd_domain *domain,
 
 	status = domain->backend->query_user(domain, mem_ctx, user_sid, info);
 
+	if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT) ||
+		NT_STATUS_EQUAL(status, NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND)) {
+		if (!domain->internal && old_status) {
+			set_domain_offline(domain);
+		}
+		if (!domain->internal &&
+			!domain->online &&
+			old_status) {
+			NTSTATUS cache_status;
+			cache_status = wcache_query_user(domain, mem_ctx, user_sid, info);
+			return cache_status;
+		}
+	}
 	/* and save it */
 	refresh_sequence_number(domain, false);
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
+	}
 	wcache_save_user(domain, status, info);
 
 	return status;
@@ -2140,7 +2338,9 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
 	NTSTATUS status;
 	unsigned int i;
 	fstring sid_string;
+	bool old_status;
 
+	old_status = domain->online;
 	status = wcache_lookup_usergroups(domain, mem_ctx, user_sid,
 					  num_groups, user_gids);
 	if (!NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
@@ -2160,11 +2360,28 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
 
 	status = domain->backend->lookup_usergroups(domain, mem_ctx, user_sid, num_groups, user_gids);
 
+	if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT) ||
+		NT_STATUS_EQUAL(status, NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND)) {
+		if (!domain->internal && old_status) {
+			set_domain_offline(domain);
+		}
+		if (!domain->internal &&
+			!domain->online &&
+			old_status) {
+			NTSTATUS cache_status;
+			cache_status = wcache_lookup_usergroups(domain, mem_ctx, user_sid,
+							  num_groups, user_gids);
+			return cache_status;
+		}
+	}
 	if ( NT_STATUS_EQUAL(status, NT_STATUS_SYNCHRONIZATION_REQUIRED) )
 		goto skip_save;
 
 	/* and save it */
 	refresh_sequence_number(domain, false);
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
+	}
 	centry = centry_start(domain, status);
 	if (!centry)
 		goto skip_save;
@@ -2272,7 +2489,9 @@ static NTSTATUS lookup_useraliases(struct winbindd_domain *domain,
 	NTSTATUS status;
 	char *sidlist;
 	int i;
+	bool old_status;
 
+	old_status = domain->online;
 	status = wcache_lookup_useraliases(domain, mem_ctx, num_sids, sids,
 					   num_aliases, alias_rids);
 	if (!NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
@@ -2297,8 +2516,25 @@ static NTSTATUS lookup_useraliases(struct winbindd_domain *domain,
 						     num_sids, sids,
 						     num_aliases, alias_rids);
 
+	if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT) ||
+		NT_STATUS_EQUAL(status, NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND)) {
+		if (!domain->internal && old_status) {
+			set_domain_offline(domain);
+		}
+		if (!domain->internal &&
+			!domain->online &&
+			old_status) {
+			NTSTATUS cache_status;
+			cache_status = wcache_lookup_useraliases(domain, mem_ctx, num_sids,
+								 sids, num_aliases, alias_rids);
+			return cache_status;
+		}
+	}
 	/* and save it */
 	refresh_sequence_number(domain, false);
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
+	}
 	centry = centry_start(domain, status);
 	if (!centry)
 		goto skip_save;
@@ -2389,7 +2625,9 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
 	NTSTATUS status;
 	unsigned int i;
 	fstring sid_string;
+	bool old_status;
 
+	old_status = domain->online;
 	status = wcache_lookup_groupmem(domain, mem_ctx, group_sid, num_names,
 					sid_mem, names, name_types);
 	if (!NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
@@ -2413,8 +2651,26 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
 						  type, num_names,
 						  sid_mem, names, name_types);
 
+	if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT) ||
+		NT_STATUS_EQUAL(status, NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND)) {
+		if (!domain->internal && old_status) {
+			set_domain_offline(domain);
+		}
+		if (!domain->internal &&
+			!domain->online &&
+			old_status) {
+			NTSTATUS cache_status;
+			cache_status = wcache_lookup_groupmem(domain, mem_ctx, group_sid,
+							      num_names, sid_mem, names,
+							      name_types);
+			return cache_status;
+		}
+	}
 	/* and save it */
 	refresh_sequence_number(domain, false);
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
+	}
 	centry = centry_start(domain, status);
 	if (!centry)
 		goto skip_save;
@@ -2449,7 +2705,71 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain,
 				struct netr_DomainTrustList *trusts)
 {
  	NTSTATUS status;
+	struct winbind_cache *cache;
+	struct winbindd_tdc_domain *dom_list = NULL;
+	size_t num_domains = 0;
+	bool retval = false;
+	int i;
+	bool old_status;
+
+	old_status = domain->online;
+	trusts->count = 0;
+	trusts->array = NULL;
+	if (domain->online) {
+		goto do_query;
+	}
+
+	cache = get_cache(domain);
+	if (!cache || !cache->tdb) {
+		goto do_query;
+	}
+
+	retval = wcache_tdc_fetch_list(&dom_list, &num_domains);
+	if (!retval || !num_domains || !dom_list) {
+		TALLOC_FREE(dom_list);
+		goto do_query;
+	}
+
+do_fetch_cache:
+	trusts->array = TALLOC_ZERO_ARRAY(mem_ctx, struct netr_DomainTrust, num_domains);
+	if (!trusts->array) {
+		TALLOC_FREE(dom_list);
+		return NT_STATUS_NO_MEMORY;
+	}
+
+	for (i = 0; i < num_domains; i++) {
+		struct netr_DomainTrust *trust;
+		struct dom_sid *sid;
+		struct winbindd_domain *dom;
+
+		dom = find_domain_from_name_noinit(dom_list[i].domain_name);
+		if (dom && dom->internal) {
+			continue;
+		}
+
+		trust = &trusts->array[trusts->count];
+		trust->netbios_name = talloc_strdup(trusts->array, dom_list[i].domain_name);
+		trust->dns_name = talloc_strdup(trusts->array, dom_list[i].dns_name);
+		sid = talloc(trusts->array, struct dom_sid);
+		if (!trust->netbios_name || !trust->dns_name ||
+			!sid) {
+			TALLOC_FREE(dom_list);
+			TALLOC_FREE(trusts->array);
+			return NT_STATUS_NO_MEMORY;
+		}
+
+		trust->trust_flags = dom_list[i].trust_flags;
+		trust->trust_attributes = dom_list[i].trust_attribs;
+		trust->trust_type = dom_list[i].trust_type;
+		sid_copy(sid, &dom_list[i].sid);
+		trust->sid = sid;
+		trusts->count++;
+	}
+
+	TALLOC_FREE(dom_list);
+	return NT_STATUS_OK;
 
+do_query:
 	/* Return status value returned by seq number check */
 
  	if (!NT_STATUS_IS_OK(domain->last_status))
@@ -2460,6 +2780,22 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain,
 
 	status = domain->backend->trusted_domains(domain, mem_ctx, trusts);
 
+	if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT) ||
+		NT_STATUS_EQUAL(status, NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND)) {
+		if (!domain->internal && old_status) {
+			set_domain_offline(domain);
+		}
+		if (!domain->internal &&
+			!domain->online &&
+			old_status) {
+			retval = wcache_tdc_fetch_list(&dom_list, &num_domains);
+			if (retval && num_domains && dom_list) {
+				TALLOC_FREE(trusts->array);
+				trusts->count = 0;
+				goto do_fetch_cache;
+			}
+		}
+	}
 	/* no trusts gives NT_STATUS_NO_MORE_ENTRIES resetting to NT_STATUS_OK
 	 * so that the generic centry handling still applies correctly -
 	 * Guenther*/
@@ -2478,7 +2814,9 @@ static NTSTATUS lockout_policy(struct winbindd_domain *domain,
  	struct winbind_cache *cache = get_cache(domain);
  	struct cache_entry *centry = NULL;
  	NTSTATUS status;
+	bool old_status;
 
+	old_status = domain->online;
 	if (!cache->tdb)
 		goto do_query;
 
@@ -2487,6 +2825,7 @@ static NTSTATUS lockout_policy(struct winbindd_domain *domain,
 	if (!centry)
  		goto do_query;
 
+do_fetch_cache:
 	policy->lockout_duration = centry_nttime(centry);
 	policy->lockout_window = centry_nttime(centry);
 	policy->lockout_threshold = centry_uint16(centry);
@@ -2512,8 +2851,26 @@ do_query:
 
 	status = domain->backend->lockout_policy(domain, mem_ctx, policy);
 
+	if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT) ||
+		NT_STATUS_EQUAL(status, NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND)) {
+		if (!domain->internal && old_status) {
+			set_domain_offline(domain);
+		}
+		if (cache->tdb &&
+			!domain->internal &&
+			!domain->online &&
+			old_status) {
+			centry = wcache_fetch(cache, domain, "LOC_POL/%s", domain->name);
+			if (centry) {
+				goto do_fetch_cache;
+			}
+		}
+	}
 	/* and save it */
  	refresh_sequence_number(domain, false);
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
+	}
 	wcache_save_lockout_policy(domain, status, policy);
 
  	return status;
@@ -2527,7 +2884,9 @@ static NTSTATUS password_policy(struct winbindd_domain *domain,
 	struct winbind_cache *cache = get_cache(domain);
 	struct cache_entry *centry = NULL;
 	NTSTATUS status;
+	bool old_status;
 
+	old_status = domain->online;
 	if (!cache->tdb)
 		goto do_query;
 
@@ -2536,6 +2895,7 @@ static NTSTATUS password_policy(struct winbindd_domain *domain,
 	if (!centry)
 		goto do_query;
 
+do_fetch_cache:
 	policy->min_password_length = centry_uint16(centry);
 	policy->password_history_length = centry_uint16(centry);
 	policy->password_properties = centry_uint32(centry);
@@ -2563,11 +2923,27 @@ do_query:
 
 	status = domain->backend->password_policy(domain, mem_ctx, policy);
 
+	if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT) ||
+		NT_STATUS_EQUAL(status, NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND)) {
+		if (!domain->internal && old_status) {
+			set_domain_offline(domain);
+		}
+		if (cache->tdb &&
+			!domain->internal &&
+			!domain->online &&
+			old_status) {
+			centry = wcache_fetch(cache, domain, "PWD_POL/%s", domain->name);
+			if (centry) {
+				goto do_fetch_cache;
+			}
+		}
+	}
 	/* and save it */
 	refresh_sequence_number(domain, false);
-	if (NT_STATUS_IS_OK(status)) {
-		wcache_save_password_policy(domain, status, policy);
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
 	}
+	wcache_save_password_policy(domain, status, policy);
 
 	return status;
 }
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 36b769bf1b..479602a9b4 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -2214,7 +2214,8 @@ NTSTATUS cm_connect_lsa_tcp(struct winbindd_domain *domain,
 
 	if (conn->lsa_pipe_tcp &&
 	    conn->lsa_pipe_tcp->transport->transport == NCACN_IP_TCP &&
-	    conn->lsa_pipe_tcp->auth->auth_level == DCERPC_AUTH_LEVEL_PRIVACY) {
+	    conn->lsa_pipe_tcp->auth->auth_level == DCERPC_AUTH_LEVEL_PRIVACY &&
+	    rpc_pipe_tcp_connection_ok(conn->lsa_pipe_tcp)) {
 		goto done;
 	}
 
diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index e7003766d8..2146953639 100644
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -199,7 +199,7 @@ static NTSTATUS enum_dom_groups(struct winbindd_domain *domain,
 		talloc_destroy(mem_ctx2);
 	} while (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES));
 
-	return NT_STATUS_OK;
+	return status;
 }
 
 /* List all domain groups */
@@ -269,7 +269,7 @@ static NTSTATUS enum_local_groups(struct winbindd_domain *domain,
 
 	} while (NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES));
 
-	return NT_STATUS_OK;
+	return result;
 }
 
 /* convert a single name to a sid in a domain */
@@ -1286,12 +1286,8 @@ NTSTATUS winbindd_lookup_names(TALLOC_CTX *mem_ctx,
 	 * This call can take a long time
 	 * allow the server to time out.
 	 * 35 seconds should do it.
-	 * NB
-	 * only do this when the undelying transport is named pipe.
 	 */
-	if (cli->transport->transport == NCACN_NP) {
-		orig_timeout = rpccli_set_timeout(cli, 35000);
-	}
+	orig_timeout = rpccli_set_timeout(cli, 35000);
 
 	status = lookup_names_fn(cli,
 				 mem_ctx,
@@ -1304,9 +1300,7 @@ NTSTATUS winbindd_lookup_names(TALLOC_CTX *mem_ctx,
 				 types);
 
 	/* And restore our original timeout. */
-	if (cli->transport->transport == NCACN_NP) {
-		rpccli_set_timeout(cli, orig_timeout);
-	}
+	rpccli_set_timeout(cli, orig_timeout);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;