From 3549425b30f00adfbee7e2a16f35a17c8e4cd2f8 Mon Sep 17 00:00:00 2001 From: Ira Cooper Date: Mon, 28 Jun 2010 13:39:28 -0400 Subject: [PATCH] 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. Signed-off-by: Jeremy Allison --- source3/smbd/process.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 3c44cca5fd..8c2060df1a 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; -- 2.34.1