Attachment 5813 Details for Bug 7533 – proposed patch.

[patch] proposed patch.

getpeerbyname.patch (text/plain), 1.85 KB, created by Ira Cooper on 2010-06-28 12:53:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ira Cooper

Created: 2010-06-28 12:53:44 UTC

Size: 1.85 KB

patch

obsolete

>commit c813078d5db3a1890bfd5d57f23d6cf958a5d694
>Author: Ira Cooper <samba@ira.wakeful.net>
>Date:   Mon Jun 28 13:39:28 2010 -0400
>
>    s3: Change exit on immediate socket failure.
>    
>    This change makes it so socket errors early in the smbd child
>    process cause orderly exits not coredumps.
>
>diff --git a/source3/smbd/process.c b/source3/smbd/process.c
>index 3c44cca..8c2060d 100644
>--- a/source3/smbd/process.c
>+++ b/source3/smbd/process.c
>@@ -2895,7 +2895,7 @@ void smbd_process(void)
> 	if (ret != 0) {
> 		int level = (errno == ENOTCONN)?2:0;
> 		DEBUG(level,("getpeername() failed - %s\n", strerror(errno)));
>-		exit_server("getpeername() failed.\n");
>+		exit_server_cleanly("getpeername() failed.\n");
> 	}
> 	ret = tsocket_address_bsd_from_sockaddr(smbd_server_conn,
> 						sa, sa_len,
>@@ -2903,7 +2903,7 @@ void smbd_process(void)
> 	if (ret != 0) {
> 		DEBUG(0,("%s: tsocket_address_bsd_from_sockaddr remote failed - %s\n",
> 			__location__, strerror(errno)));
>-		exit_server("tsocket_address_bsd_from_sockaddr remote failed.\n");
>+		exit_server_cleanly("tsocket_address_bsd_from_sockaddr remote failed.\n");
> 	}
> 
> 	sa = (struct sockaddr *)(void *)&ss;
>@@ -2912,7 +2912,7 @@ void smbd_process(void)
> 	if (ret != 0) {
> 		int level = (errno == ENOTCONN)?2:0;
> 		DEBUG(level,("getsockname() failed - %s\n", strerror(errno)));
>-		exit_server("getsockname() failed.\n");
>+		exit_server_cleanly("getsockname() failed.\n");
> 	}
> 	ret = tsocket_address_bsd_from_sockaddr(smbd_server_conn,
> 						sa, sa_len,
>@@ -2920,7 +2920,7 @@ void smbd_process(void)
> 	if (ret != 0) {
> 		DEBUG(0,("%s: tsocket_address_bsd_from_sockaddr remote failed - %s\n",
> 			__location__, strerror(errno)));
>-		exit_server("tsocket_address_bsd_from_sockaddr remote failed.\n");
>+		exit_server_cleanly("tsocket_address_bsd_from_sockaddr remote failed.\n");
> 	}
> 
> 	smbd_server_conn->local_address = local_address;

Actions: View

Attachments on bug 7533: 5813