diff options
author | Nicholas Marriott <nicm@openbsd.org> | 2009-11-04 22:40:36 +0000 |
---|---|---|
committer | Nicholas Marriott <nicm@openbsd.org> | 2009-11-04 22:40:36 +0000 |
commit | 06ffed32169a6bf449f543803ee8b87c439ae94b (patch) | |
tree | 950016e959026d7ceef17b2bf7a5565f2bf1ade2 | |
parent | 91ad830c8863ab66038226f9e16bc87cbbdb6d95 (diff) |
Call event_init() before loading the config file, since potentially it could
set up events.
-rw-r--r-- | server.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -163,6 +163,8 @@ server_start(char *path) server_fd = server_create_socket(); server_client_create(pair[1]); + event_init(); + if (access(SYSTEM_CFG, R_OK) == 0) { if (load_cfg(SYSTEM_CFG, NULL, &cause) != 0) goto error; @@ -173,8 +175,6 @@ server_start(char *path) if (cfg_file != NULL && load_cfg(cfg_file, NULL, &cause) != 0) goto error; - event_init(); - event_set(&server_ev_accept, server_fd, EV_READ|EV_PERSIST, server_accept_callback, NULL); event_add(&server_ev_accept, NULL); |