summaryrefslogtreecommitdiff
path: root/ctdb
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2018-10-10 18:19:32 +1100
committerKarolin Seeger <kseeger@samba.org>2018-10-29 14:11:44 +0100
commitec065a8ac2e4f675ed7cc949ae20e75235dede95 (patch)
treeac2c2170b6bc87203130dbc26ba7d9dc9719398a /ctdb
parent7ead723db077686a33d52af0991825807c058341 (diff)
downloadsamba-ec065a8ac2e4f675ed7cc949ae20e75235dede95.tar.gz
ctdb-event: Check the return status of sock_daemon_set_startup_fd
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 a1909603808b994b7822b697494e39e8da4aaa66) Autobuild-User(v4-8-test): Karolin Seeger <kseeger@samba.org> Autobuild-Date(v4-8-test): Mon Oct 29 14:11:44 CET 2018 on sn-devel-144
Diffstat (limited to 'ctdb')
-rw-r--r--ctdb/server/ctdb_eventd.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/ctdb/server/ctdb_eventd.c b/ctdb/server/ctdb_eventd.c
index f79ee9990d1..3876acd4a76 100644
--- a/ctdb/server/ctdb_eventd.c
+++ b/ctdb/server/ctdb_eventd.c
@@ -990,6 +990,7 @@ int main(int argc, const char **argv)
struct sock_socket_funcs socket_funcs;
struct stat statbuf;
int opt, ret;
+ bool ok;
/* Set default options */
options.pid = -1;
@@ -1073,7 +1074,10 @@ int main(int argc, const char **argv)
}
if (options.startup_fd != -1) {
- sock_daemon_set_startup_fd(sockd, options.startup_fd);
+ ok = sock_daemon_set_startup_fd(sockd, options.startup_fd);
+ if (!ok) {
+ goto fail;
+ }
}
ret = sock_daemon_run(ev, sockd,