summaryrefslogtreecommitdiff
path: root/kike.c
diff options
context:
space:
mode:
authorPřemysl Janouch <p.janouch@gmail.com>2015-08-17 00:04:57 +0200
committerPřemysl Janouch <p.janouch@gmail.com>2015-08-17 00:13:05 +0200
commitabd892cbd7d09086c7c3d45ba6bc53ed95176d3b (patch)
treebab95c3cfa885cb47d4689a6e893edf4c7fe98ed /kike.c
parent4ae95be9db742f67d313d2579cddbc0b00b1bd08 (diff)
downloadxK-abd892cbd7d09086c7c3d45ba6bc53ed95176d3b.tar.gz
xK-abd892cbd7d09086c7c3d45ba6bc53ed95176d3b.tar.xz
xK-abd892cbd7d09086c7c3d45ba6bc53ed95176d3b.zip
Bump liberty
Diffstat (limited to 'kike.c')
-rw-r--r--kike.c8
1 files changed, 4 insertions, 4 deletions
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);