aboutsummaryrefslogtreecommitdiff
path: root/server.c
diff options
context:
space:
mode:
Diffstat (limited to 'server.c')
-rw-r--r--server.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/server.c b/server.c
index f46dd056..3a2580a9 100644
--- a/server.c
+++ b/server.c
@@ -239,6 +239,8 @@ server_start(struct tmuxproc *client, int flags, struct event_base *base,
evtimer_set(&server_ev_tidy, server_tidy_event, NULL);
evtimer_add(&server_ev_tidy, &tv);
+ server_acl_init();
+
server_add_accept(0);
proc_loop(server_proc, server_loop);
@@ -355,9 +357,10 @@ server_update_socket(void)
static void
server_accept(int fd, short events, __unused void *data)
{
- struct sockaddr_storage sa;
- socklen_t slen = sizeof sa;
- int newfd;
+ struct sockaddr_storage sa;
+ socklen_t slen = sizeof sa;
+ int newfd;
+ struct client *c;
server_add_accept(0);
if (!(events & EV_READ))
@@ -374,11 +377,16 @@ server_accept(int fd, short events, __unused void *data)
}
fatal("accept failed");
}
+
if (server_exit) {
close(newfd);
return;
}
- server_client_create(newfd);
+ c = server_client_create(newfd);
+ if (!server_acl_join(c)) {
+ c->exit_message = xstrdup("access not allowed");
+ c->flags |= CLIENT_EXIT;
+ }
}
/*