p/xK
1
1
Fork 0
Code Issues 1 Pull Requests Releases 11 Wiki Activity

Bump liberty

Browse Source
This commit is contained in:
Přemysl Eric Janouch
2015-08-17 00:04:57 +02:00
parent 4ae95be9db
commit abd892cbd7
4 changed files with 9 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kike.c
View File

@@ -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);