sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

r18189: When tearing down a connection we can be harsher

Browse Source 
with timeouts. Also, wait for 5 seconds not 10
on connecting to a DC.
Jeremy.
(This used to be commit 6792460ba6)
This commit is contained in:
Jeremy Allison 2006-09-06 19:02:39 +00:00 committed by Gerald (Jerry) Carter
parent 995205fc60
commit 012c9e9cf9
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
source3/nsswitch/winbindd_cm.c
View File

@ -757,7 +757,8 @@ static BOOL find_new_dc(TALLOC_CTX *mem_ctx,
if ((addrs == NULL) || (dcnames == NULL))
return False;
if ( !open_any_socket_out(addrs, num_addrs, 10000, &fd_index, fd) )
/* 5 second timeout. */
if ( !open_any_socket_out(addrs, num_addrs, 5000, &fd_index, fd) )
{
for (i=0; i<num_dcs; i++) {
add_failed_connection_entry(domain->name,
@ -847,7 +848,8 @@ static NTSTATUS cm_open_connection(struct winbindd_domain *domain,
add_sockaddr_to_array(mem_ctx, domain->dcaddr.sin_addr, 445, &addrs, &num_addrs);
add_sockaddr_to_array(mem_ctx, domain->dcaddr.sin_addr, 139, &addrs, &num_addrs);
if (!open_any_socket_out(addrs, num_addrs, 10000, &dummy, &fd)) {
/* 5 second timeout. */
if (!open_any_socket_out(addrs, num_addrs, 5000, &dummy, &fd)) {
domain->online = False;
fd = -1;
}
@ -890,18 +892,40 @@ static NTSTATUS cm_open_connection(struct winbindd_domain *domain,
void invalidate_cm_connection(struct winbindd_cm_conn *conn)
{
/* We're closing down a possibly dead
connection. Don't have impossibly long (10s) timeouts. */
if (conn->cli) {
cli_set_timeout(conn->cli, 1000); /* 1 second. */
}
if (conn->samr_pipe != NULL) {
cli_rpc_pipe_close(conn->samr_pipe);
if (!cli_rpc_pipe_close(conn->samr_pipe)) {
/* Ok, it must be dead. Drop timeout to 0.5 sec. */
if (conn->cli) {
cli_set_timeout(conn->cli, 500);
}
}
conn->samr_pipe = NULL;
}
if (conn->lsa_pipe != NULL) {
cli_rpc_pipe_close(conn->lsa_pipe);
if (!cli_rpc_pipe_close(conn->lsa_pipe)) {
/* Ok, it must be dead. Drop timeout to 0.5 sec. */
if (conn->cli) {
cli_set_timeout(conn->cli, 500);
}
}
conn->lsa_pipe = NULL;
}
if (conn->netlogon_pipe != NULL) {
cli_rpc_pipe_close(conn->netlogon_pipe);
if (!cli_rpc_pipe_close(conn->netlogon_pipe)) {
/* Ok, it must be dead. Drop timeout to 0.5 sec. */
if (conn->cli) {
cli_set_timeout(conn->cli, 500);
}
}
conn->netlogon_pipe = NULL;
}