summaryrefslogtreecommitdiffstats
path: root/server.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2017-01-25 16:38:13 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2017-01-25 16:38:13 +0000
commit0f9354eec211247fc83d1397d12c7e0708f70285 (patch)
tree8ec0a877e178944e8af2965bcdad443e77b5adac /server.c
parent21d8f77a0d45c187b1d3f5b745acbb70e3b880c6 (diff)
Bad merge.
Diffstat (limited to 'server.c')
-rw-r--r--server.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/server.c b/server.c
index fa2d1c81..b84f5e1e 100644
--- a/server.c
+++ b/server.c
@@ -26,6 +26,7 @@
#include <errno.h>
#include <event.h>
#include <fcntl.h>
+#include <paths.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
@@ -147,7 +148,6 @@ server_start(struct event_base *base, int lockfd, char *lockfile)
if (log_get_level() > 3)
tty_create_log();
-
if (pledge("stdio rpath wpath cpath fattr unix getpw recvfd proc exec "
"tty ps", NULL) != 0)
fatal("pledge failed");
@@ -157,7 +157,6 @@ server_start(struct event_base *base, int lockfd, char *lockfile)
TAILQ_INIT(&clients);
RB_INIT(&sessions);
TAILQ_INIT(&session_groups);
- mode_key_init_trees();
key_bindings_init();
gettimeofday(&start_time, NULL);