Attachment 3619 Details for Bug 5737 – Patch I've applied.

[patch] Patch I've applied.

look (text/plain), 1.24 KB, created by Jeremy Allison on 2008-09-23 18:37:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2008-09-23 18:37:52 UTC

Size: 1.24 KB

patch

obsolete

>diff --git a/source/winbindd/winbindd_dual.c b/source/winbindd/winbindd_dual.c
>index f2be6d6..9a85c0c 100644
>--- a/source/winbindd/winbindd_dual.c
>+++ b/source/winbindd/winbindd_dual.c
>@@ -196,10 +196,12 @@ static void async_request_fail(struct winbindd_async_request *state)
> 
> 	TALLOC_FREE(state->reply_timeout_event);
> 
>-	SMB_ASSERT(state->child_pid != (pid_t)0);
>+	/* If child exists and is not already reaped,
>+	   send kill signal to child. */
> 
>-	/* If not already reaped, send kill signal to child. */
>-	if (state->child->pid == state->child_pid) {
>+	if ((state->child->pid != (pid_t)0) &&
>+			(state->child->pid != (pid_t)-1) &&
>+			(state->child->pid == state->child_pid)) {
> 		kill(state->child_pid, SIGTERM);
> 
> 		/* 
>@@ -295,12 +297,14 @@ static void schedule_async_request(struct winbindd_child *child)
> 	}
> 
> 	if ((child->pid == 0) && (!fork_domain_child(child))) {
>-		/* Cancel all outstanding requests */
>+		/* fork_domain_child failed.
>+		   Cancel all outstanding requests */
> 
> 		while (request != NULL) {
> 			/* request might be free'd in the continuation */
> 			struct winbindd_async_request *next = request->next;
>-			request->continuation(request->private_data, False);
>+
>+			async_request_fail(request);
> 			request = next;
> 		}
> 		return;

Actions: View

Attachments on bug 5737: 3604 | 3605 | 3619