sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

- close the listening socket in the child process when running as a daemon

Browse Source 
- exit with a non-zero exit code if open_sockets() fails
This commit is contained in:
Andrew Tridgell 0001-01-01 00:00:00 +00:00
parent a7005f50d8
commit 83866f3c84
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source/smbd/server.c
View File

@ -2225,6 +2225,9 @@ static BOOL open_sockets(BOOL is_daemon,int port)
signal(SIGPIPE, SIGNAL_CAST sig_pipe);
signal(SIGCLD, SIGNAL_CAST SIG_DFL);
#endif
/* close the listening socket */
close(s);
/* close our standard file descriptors */
close_low_fds();
@ -4280,22 +4283,23 @@ int main(int argc,char *argv[])
become_daemon();
}
if (open_sockets(is_daemon,port))
{
/* possibly reload the services file. */
reload_services(True);
if (!open_sockets(is_daemon,port))
exit(1);
maxxmit = MIN(lp_maxxmit(),BUFFER_SIZE);
/* possibly reload the services file. */
reload_services(True);
if (*lp_rootdir())
{
if (sys_chroot(lp_rootdir()) == 0)
DEBUG(2,("%s changed root to %s\n",timestring(),lp_rootdir()));
}
maxxmit = MIN(lp_maxxmit(),BUFFER_SIZE);
process();
close_sockets();
if (*lp_rootdir())
{
if (sys_chroot(lp_rootdir()) == 0)
DEBUG(2,("%s changed root to %s\n",timestring(),lp_rootdir()));
}
process();
close_sockets();
exit_server("normal exit");
return(0);
}