From abd892cbd7d09086c7c3d45ba6bc53ed95176d3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Janouch?= Date: Mon, 17 Aug 2015 00:04:57 +0200 Subject: Bump liberty --- kike.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kike.c') diff --git a/kike.c b/kike.c index 3b100e2..4fabced 100644 --- a/kike.c +++ b/kike.c @@ -34,7 +34,7 @@ enum { PIPE_READ, PIPE_WRITE }; // Just get rid of the crappiest ciphers available by default #define DEFAULT_CIPHERS "DEFAULT:!MEDIUM:!LOW" -static struct config_item g_config_table[] = +static struct simple_config_item g_config_table[] = { { "pid_file", NULL, "Path or name of the PID file" }, { "server_name", NULL, "Server name" }, @@ -666,7 +666,7 @@ server_context_init (struct server_context *self) str_map_init (&self->config); self->config.free = free; - load_config_defaults (&self->config, g_config_table); + simple_config_load_defaults (&self->config, g_config_table); str_vector_init (&self->motd); self->catalog = (nl_catd) -1; @@ -3982,7 +3982,7 @@ main (int argc, char *argv[]) printf (PROGRAM_NAME " " PROGRAM_VERSION "\n"); exit (EXIT_SUCCESS); case 'w': - call_write_default_config (optarg, g_config_table); + call_simple_config_write_default (optarg, g_config_table); exit (EXIT_SUCCESS); default: print_error ("wrong options"); @@ -4007,7 +4007,7 @@ main (int argc, char *argv[]) irc_register_cap_handlers (&ctx); struct error *e = NULL; - if (!read_config_file (&ctx.config, &e)) + if (!simple_config_update_from_file (&ctx.config, &e)) { print_error ("error loading configuration: %s", e->message); error_free (e); -- cgit v1.2.3