sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-15 05:57:49 +03:00
Code

ctdb-daemon: Open eventd pipe earlier

Browse Source 
The pipe will soon be needed earlier, so initialise it earlier.
Ensure the file descriptors are closed on error.

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

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(cherry picked from commit c446ae5e1382d5e32c33ce92243daf6b4338e15a)
This commit is contained in:
Martin Schwenke 2018-08-27 14:44:24 +10:00 committed by Stefan Metzmacher
parent a4021fb56d
commit eb3d91ed61
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ctdb/server/eventscript.c
View File

@ -175,8 +175,15 @@ int ctdb_start_eventd(struct ctdb_context *ctdb)
return -1;
}
ret = pipe(fd);
if (ret != 0) {
return -1;
}
argv = talloc_array(ectx, const char *, 14);
if (argv == NULL) {
close(fd[0]);
close(fd[1]);
return -1;
}
@ -201,6 +208,8 @@ int ctdb_start_eventd(struct ctdb_context *ctdb)
argv[13] = NULL;
if (argv[6] == NULL) {
close(fd[0]);
close(fd[1]);
talloc_free(argv);
return -1;
}
@ -210,11 +219,6 @@ int ctdb_start_eventd(struct ctdb_context *ctdb)
argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
argv[6], argv[7], argv[8], argv[9], argv[10]));
ret = pipe(fd);
if (ret != 0) {
return -1;
}
pid = ctdb_fork(ctdb);
if (pid == -1) {
close(fd[0]);