summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorIra Cooper <samba@ira.wakeful.net>2010-06-28 13:39:28 -0400
committerJeremy Allison <jra@samba.org>2010-06-28 12:08:03 -0700
commit3549425b30f00adfbee7e2a16f35a17c8e4cd2f8 (patch)
treeea9b7302b312a5b6b76a986ba07742a434489c30 /source3
parentb6eb17eb1eb23461149b6c8cbefc41f5265a77d9 (diff)
downloadsamba-3549425b30f00adfbee7e2a16f35a17c8e4cd2f8.tar.gz
samba-3549425b30f00adfbee7e2a16f35a17c8e4cd2f8.tar.bz2
samba-3549425b30f00adfbee7e2a16f35a17c8e4cd2f8.zip
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 <jra@samba.org>
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/process.c8
1 files 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;