summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ctdb/server/eventscript.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/ctdb/server/eventscript.c b/ctdb/server/eventscript.c
index 74f132c0e80..02924a7f471 100644
--- a/ctdb/server/eventscript.c
+++ b/ctdb/server/eventscript.c
@@ -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]);