summaryrefslogtreecommitdiffstats
path: root/ctdb/server
diff options
context:
space:
mode:
Diffstat (limited to 'ctdb/server')
-rw-r--r--ctdb/server/ctdb_event_helper.c12
-rw-r--r--ctdb/server/ctdb_lock_helper.c2
2 files changed, 2 insertions, 12 deletions
diff --git a/ctdb/server/ctdb_event_helper.c b/ctdb/server/ctdb_event_helper.c
index ab1eae44091..be36b0b72a9 100644
--- a/ctdb/server/ctdb_event_helper.c
+++ b/ctdb/server/ctdb_event_helper.c
@@ -19,6 +19,7 @@
#include "includes.h"
#include "system/filesys.h"
+#include "ctdb_private.h"
static char *progname = NULL;
@@ -38,17 +39,6 @@ static void sigterm(int sig)
_exit(0);
}
-static void set_close_on_exec(int fd)
-{
- int v;
-
- v = fcntl(fd, F_GETFD, 0);
- if (v == -1) {
- return;
- }
- fcntl(fd, F_SETFD, v | FD_CLOEXEC);
-}
-
static int check_executable(const char *path)
{
struct stat st;
diff --git a/ctdb/server/ctdb_lock_helper.c b/ctdb/server/ctdb_lock_helper.c
index d8a1d249b75..b1515a256e1 100644
--- a/ctdb/server/ctdb_lock_helper.c
+++ b/ctdb/server/ctdb_lock_helper.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "tdb.h"
#include "system/filesys.h"
-#include "../include/ctdb_private.h"
+#include "ctdb_private.h"
static char *progname = NULL;