diff options
| author | Marc VanHeyningen <marc.vanheyningen@isilon.com> | 2009-05-05 21:18:50 +0000 |
|---|---|---|
| committer | Tim Prouty <tprouty@samba.org> | 2009-05-27 13:16:17 -0700 |
| commit | a4887e250b84c321c75d54b9d3adf6fcf7c27fed (patch) | |
| tree | 318c1079a6199d283bed94ee3733c9e32855922c /source3/nmbd | |
| parent | 75de7c0e87cc5ecea1a7d7e9b0103a8cc2827895 (diff) | |
| download | samba-a4887e250b84c321c75d54b9d3adf6fcf7c27fed.tar.gz samba-a4887e250b84c321c75d54b9d3adf6fcf7c27fed.tar.bz2 samba-a4887e250b84c321c75d54b9d3adf6fcf7c27fed.zip | |
s3: Allow child processes to exit gracefully if we are out of fds
When we run out of file descriptors for some reason, every new
connection forks a child that immediately panics causing smbd to
coredump. This seems unnecessarily harsh; with this code change we
now catch that error and merely log a message about it and exit
without the core dump.
Signed-off-by: Tim Prouty <tprouty@samba.org>
Diffstat (limited to 'source3/nmbd')
| -rw-r--r-- | source3/nmbd/asyncdns.c | 4 | ||||
| -rw-r--r-- | source3/nmbd/nmbd.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/nmbd/asyncdns.c b/source3/nmbd/asyncdns.c index 0736a66fb8..85729ae7ac 100644 --- a/source3/nmbd/asyncdns.c +++ b/source3/nmbd/asyncdns.c @@ -164,8 +164,8 @@ void start_async_dns(void) CatchSignal(SIGHUP, SIG_IGN); CatchSignal(SIGTERM, SIGNAL_CAST sig_term ); - if (!reinit_after_fork(nmbd_messaging_context(), - nmbd_event_context(), true)) { + if (!NT_STATUS_IS_OK(reinit_after_fork(nmbd_messaging_context(), + nmbd_event_context(), true))) { DEBUG(0,("reinit_after_fork() failed\n")); smb_panic("reinit_after_fork() failed"); } diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c index daf4c295a6..903dc36d53 100644 --- a/source3/nmbd/nmbd.c +++ b/source3/nmbd/nmbd.c @@ -913,8 +913,8 @@ static bool open_sockets(bool isdaemon, int port) pidfile_create("nmbd"); - if (!reinit_after_fork(nmbd_messaging_context(), - nmbd_event_context(), false)) { + if (!NT_STATUS_IS_OK(reinit_after_fork(nmbd_messaging_context(), + nmbd_event_context(), false))) { DEBUG(0,("reinit_after_fork() failed\n")); exit(1); } |