sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-26 01:49:31 +03:00
Code Activity

ctdb-common: Set close-on-exec for startup fd

Browse Source 
The startup_fd should not be propagated to the child processes created
from a daemon.  It should only be used in the daemon code to return the
status of the startup.  Another use of startup_fd is to notify the
parent if the daemon process has exited.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13659

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
(cherry picked from commit 80549927bc)
This commit is contained in:
Amitay Isaacs
2018-10-10 18:16:33 +11:00
committed by Karolin Seeger
parent 1616cbd522
commit ec028efc66
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ctdb/common/sock_daemon.c
View File

@ -523,9 +523,15 @@ int sock_daemon_add_unix(struct sock_daemon_context *sockd,
return 0;
}
void sock_daemon_set_startup_fd(struct sock_daemon_context *sockd, int fd)
bool sock_daemon_set_startup_fd(struct sock_daemon_context *sockd, int fd)
{
if (! set_close_on_exec(fd)) {
D_ERR("Failed to set close-on-exec on startup fd\n");
return false;
}
sockd->startup_fd = fd;
return true;
}
/*

3
ctdb/common/sock_daemon.h
View File

@ -216,8 +216,9 @@ int sock_daemon_add_unix(struct sock_daemon_context *sockd,
*
* @param[in] sockd Socket daemon context
* @param[in] fd File descriptor
* @return true on success, false on error
*/
void sock_daemon_set_startup_fd(struct sock_daemon_context *sockd, int fd);
bool sock_daemon_set_startup_fd(struct sock_daemon_context *sockd, int fd);
/**
* @brief Async computation start to run a socket daemon