From 201acad409d89fcec2a8ad62a97cba0a86cbdbc7 Mon Sep 17 00:00:00 2001
From: Jan Vidar Krey <janvidar@extatic.org>
Date: Thu, 15 Apr 2010 19:49:23 +0200
Subject: [PATCH] Do not use C macros for configuration files.

---
 src/core/config.c     |  125 ++--
 src/core/config.pl    |  129 +++-
 src/core/config.xml   |   21 +-
 src/core/gen_config.c | 1413 ++++++++++++++++++++++++++++++++++-------
 src/core/gen_config.h |   82 ---
 5 files changed, 1325 insertions(+), 445 deletions(-)

diff --git a/src/core/config.c b/src/core/config.c
index 63f37d6..8ab295d 100644
--- a/src/core/config.c
+++ b/src/core/config.c
@@ -29,101 +29,52 @@
 #define INT_MIN (-0x7fffffff - 1)
 #endif
 
-#define CFG_APPLY_BOOLEAN(KEY, TARGET) \
-	if (strcmp(KEY, key) == 0) \
-	{ \
-		if      (strlen(data) == 1 && (data[0] == '1')) TARGET = 1; \
-		else if (strlen(data) == 1 && (data[0] == '0')) TARGET = 0; \
-		else if (strncasecmp(data, "true",  4) == 0) TARGET = 1; \
-		else if (strncasecmp(data, "false", 5) == 0) TARGET = 0; \
-		else if (strncasecmp(data, "yes",   3) == 0) TARGET = 1; \
-		else if (strncasecmp(data, "no",    2) == 0) TARGET = 0; \
-		else if (strncasecmp(data, "on",    2) == 0) TARGET = 1; \
-		else if (strncasecmp(data, "off",   3) == 0) TARGET = 0; \
-		else\
-		{ \
-			LOG_FATAL("Configuration error on line %d: '%s' must be either '1' or '0'", line_count, key); \
-			return -1; \
-		} \
-		return 0; \
-	}
-
-#define CFG_APPLY_STRING(KEY, TARGET) \
-	if (strcmp(KEY, key) == 0) \
-	{ \
-		TARGET = hub_strdup(data); \
-		return 0; \
-	}
-
-
-#define CFG_APPLY_INTEGER(KEY, TARGET) \
-	if (strcmp(KEY, key) == 0) \
-	{ \
-		char* endptr; \
-		int val; \
-		errno = 0; \
-		val = strtol(data, &endptr, 10); \
-		if (((errno == ERANGE && (val == INT_MAX || val == INT_MIN)) || (errno != 0 && val == 0)) || endptr == data) { \
-			LOG_FATAL("Configuration error on line %d: '%s' must be a number", line_count, key); \
-			return -1; \
-		} \
-		TARGET = val; \
-		return 0; \
-	}
-
-
-#define DEFAULT_STRING(KEY, VALUE) \
-{ \
-	if (config->KEY == 0) \
-		config->KEY = hub_strdup(VALUE); \
+static int apply_boolean(const char* key, const char* data, int* target)
+{
+	if      (strlen(data) == 1 && (data[0] == '1')) *target = 1;
+	else if (strlen(data) == 1 && (data[0] == '0')) *target = 0;
+	else if (strncasecmp(data, "true",  4) == 0) *target = 1;
+	else if (strncasecmp(data, "false", 5) == 0) *target = 0;
+	else if (strncasecmp(data, "yes",   3) == 0) *target = 1;
+	else if (strncasecmp(data, "no",    2) == 0) *target = 0;
+	else if (strncasecmp(data, "on",    2) == 0) *target = 1;
+	else if (strncasecmp(data, "off",   3) == 0) *target = 0;
+	else
+		return 0;
+	return 1;
 }
 
-#define DEFAULT_INTEGER(KEY, VALUE) \
-{ \
-	if (config->KEY == 0) \
-		config->KEY = VALUE; \
+static int apply_string(const char* key, const char* data, char** target, char* regexp)
+{
+	(void) regexp;
+	// FIXME: Add regexp checks for correct data
+
+	if (*target)
+		hub_free(*target);
+
+	*target = hub_strdup(data);
+	return 1;
 }
 
-#define DEFAULT_BOOLEAN(KEY, VALUE) \
-	config->KEY = config->KEY & 0x000000ff;
+static int apply_integer(const char* key, const char* data, int* target, int* min, int* max)
+{
+	char* endptr;
+	int val;
+	errno = 0;
+	val = strtol(data, &endptr, 10);
 
-#define GET_STR(NAME)  CFG_APPLY_STRING ( #NAME , config->NAME )
-#define GET_INT(NAME)  CFG_APPLY_INTEGER( #NAME , config->NAME )
-#define GET_BOOL(NAME) CFG_APPLY_BOOLEAN( #NAME , config->NAME )
-#define IGNORED(NAME) \
-    if (strcmp(#NAME, key) == 0) \
-    { \
-        LOG_WARN("Configuration option %s deprecated and ingnored.", key); \
-        return 0; \
-    }
+	if (((errno == ERANGE && (val == INT_MAX || val == INT_MIN)) || (errno != 0 && val == 0)) || endptr == data)
+			return 0;
 
-#define DUMP_STR(NAME, DEFAULT) \
-	if (ignore_defaults) \
-	{ \
-		if (strcmp(config->NAME, DEFAULT) != 0) \
-			fprintf(stdout, "%s = \"%s\"\n", #NAME , config->NAME); \
-	} \
-	else \
-		fprintf(stdout, "%s = \"%s\"\n", #NAME , config->NAME); \
-		
-#define DUMP_INT(NAME, DEFAULT) \
-	if (ignore_defaults) \
-	{ \
-		if (config->NAME != DEFAULT) \
-			fprintf(stdout, "%s = %d\n", #NAME , config->NAME); \
-	} \
-	else \
-		fprintf(stdout, "%s = %d\n", #NAME , config->NAME); \
+	if (min && val < *min)
+		return 0;
 
-#define DUMP_BOOL(NAME, DEFAULT) \
-	if (ignore_defaults) \
-	{ \
-		if (config->NAME != DEFAULT) \
-			fprintf(stdout, "%s = %s\n", #NAME , (config->NAME ? "yes" : "no")); \
-	} \
-	else \
-		fprintf(stdout, "%s = %s\n", #NAME , (config->NAME ? "yes" : "no"));
+	if (max && val > *max)
+		return 0;
 
+	*target = val;
+	return 1;
+}
 
 #include "gen_config.c"
 
diff --git a/src/core/config.pl b/src/core/config.pl
index 2f5ec16..0037ffd 100755
--- a/src/core/config.pl
+++ b/src/core/config.pl
@@ -20,8 +20,7 @@ open GENHEAD, ">gen_config.h" || die "Unable to write header file";
 print GENHEAD "/* THIS FILE IS AUTOGENERATED - DO NOT CHANGE IT! */\n\nstruct hub_config\n{\n";
 foreach my $p ($tree->root->children("option"))
 {
-	my @data = ($p->att("type"), $p->att("name"), $p->att("default"), $p->att("advanced"), $p->children_text("short"), $p->children_text("description"), $p->children_text("since"), $p->children_text("example"));
-	write_c_header(@data);
+	write_c_header(get_data($p));
 }
 print GENHEAD "};\n\n";
 
@@ -38,7 +37,8 @@ foreach my $p ($tree->root->children("option"))
 print GENIMPL "}\n\n";
 
 # apply function
-print GENIMPL "static int apply_config(struct hub_config* config, char* key, char* data, int line_count)\n{\n";
+print GENIMPL "static int apply_config(struct hub_config* config, char* key, char* data, int line_count)\n{\n\tint max = 0;\n\tint min = 0;\n\n";
+
 foreach my $p ($tree->root->children("option"))
 {
 	write_c_impl_apply(get_data($p));
@@ -105,29 +105,92 @@ sub write_c_impl_defaults(@)
 {
 	my @output = @_;
 	my ($type, $name, $default, $advanced, $short, $desc, $since, $example) = @output;
+	my $prefix = "";
+	my $suffix = "";
 
-	print GENIMPL "\t";
-	print GENIMPL "DEFAULT_INTEGER" if ($type eq "int");
-	print GENIMPL "DEFAULT_BOOLEAN" if ($type eq "boolean");
-
+	print GENIMPL "\tconfig->$name = ";
 	if ($type =~ /(string|file|message)/)
 	{
-		print GENIMPL "DEFAULT_STRING ";
-		$default = "\"" . $default . "\"";
+		$prefix = "hub_strdup(\"";
+		$suffix = "\")"
 	}
-	print GENIMPL "(" . $name . ", " . $default . ");\n";
+	print GENIMPL $prefix . $default . $suffix . ";\n";
 }
 
 sub write_c_impl_apply(@)
 {
 	my @output = @_;
-	my ($type, $name, $default, $advanced, $short, $desc, $since, $example) = @output;
+	my ($type, $name, $default, $advanced, $short, $desc, $since, $example, $p) = @output;
 
-	print GENIMPL "\t";
-	print GENIMPL "GET_INT " if ($type eq "int");
-	print GENIMPL "GET_BOOL" if ($type eq "boolean");
-	print GENIMPL "GET_STR " if ($type =~ /(string|file|message)/);
-	print GENIMPL "(" . $name . ");\n";
+	my $min;
+	my $max;
+	my $regexp;
+
+	if (defined $p)
+	{
+		$min = $p->att("min");
+		$max = $p->att("max");
+		$regexp = $p->att("regexp");
+
+		print "'check' is defined for option $name";
+		print ", min=$min" if (defined $min);
+		print ", max=$max" if (defined $max);
+		print ", regexp=\"$regexp\"" if (defined $regexp);
+		print "\n";
+	}
+
+	print GENIMPL "\tif (!strcmp(key, \"" . $name . "\"))\n\t{\n";
+
+	if ($type eq "int")
+	{
+		if (defined $min)
+		{
+			print GENIMPL "\t\tmin = $min;\n"
+		}
+		if (defined $max)
+		{
+			print GENIMPL "\t\tmax = $max;\n"
+		}
+
+		print GENIMPL "\t\tif (!apply_integer(key, data, &config->$name, ";
+
+		if (defined $min)
+		{
+			print GENIMPL "&min";
+		}
+		else
+		{
+			print GENIMPL "0";
+		}
+
+		print GENIMPL ", ";
+
+		if (defined $max)
+		{
+			print GENIMPL "&max";
+		}
+		else
+		{
+			print GENIMPL "0";
+		}
+
+		print GENIMPL "))\n";
+	}
+	elsif ($type eq "boolean")
+	{
+		print GENIMPL "\t\tif (!apply_boolean(key, data, &config->$name))\n";
+	}
+	elsif ($type =~ /(string|file|message)/)
+	{
+		print GENIMPL "\t\tif (!apply_string(key, data, &config->$name, (char*) \"\"))\n";
+	}
+
+	print GENIMPL "\t\t{\n" .
+				  "\t\t\tLOG_ERROR(\"Configuration parse error on line %d\", line_count);\n" .
+				  "\t\t\treturn -1;\n" .
+				  "\t\t}\n" .
+				  "\t\treturn 0;\n" .
+				  "\t}\n\n";
 }
 
 sub write_c_impl_free(@)
@@ -135,30 +198,44 @@ sub write_c_impl_free(@)
 	my @output = @_;
 	my ($type, $name, $default, $advanced, $short, $desc, $since, $example) = @output;
 
-	print GENIMPL "\thub_free(config->" . $name . ");\n" if ($type =~ /(string|file|message)/)
+	if ($type =~ /(string|file|message)/)
+	{
+		print GENIMPL "\thub_free(config->" . $name . ");\n\n" 
+	}
 }
 
 sub write_c_impl_dump(@)
 {
 	my @output = @_;
 	my ($type, $name, $default, $advanced, $short, $desc, $since, $example) = @output;
+	my $out;
+	my $val = "config->$name";
+	my $test = "config->$name != $default";
 
-	print GENIMPL "\t";
-	print GENIMPL "DUMP_INT " if ($type eq "int");
-	print GENIMPL "DUMP_BOOL" if ($type eq "boolean");
-
-	if ($type =~ /(string|file|message)/)
+	if ($type eq "int")
 	{
-		print GENIMPL "DUMP_STR";
-		$default = "\"" . $default . "\"";
+		$out = "%d";
 	}
-	print GENIMPL "(" . $name . ", " . $default . ");\n"
+	elsif ($type eq "boolean")
+	{
+		$out = "%s";
+		$val = "config->$name ? \"yes\" : \"no\"";
+	}
+	elsif ($type =~ /(string|file|message)/)
+	{
+		$out = "\\\"%s\\\"";
+		$test = "strcmp(config->$name, \"$default\") != 0";
+	}
+
+	print GENIMPL "\tif (!ignore_defaults || $test)\n";
+	print GENIMPL "\t\tfprintf(stdout, \"$name = $out\\n\", $val);\n\n";
 }
 
 sub get_data($)
 {
 	my $p = shift;
-	my @data = ($p->att("type"), $p->att("name"), $p->att("default"), $p->att("advanced"), $p->children_text("short"), $p->children_text("description"), $p->children_text("since"), $p->children_text("example"));
+	my $check = $p->first_child_matches("check");
+	my @data = ($p->att("type"), $p->att("name"), $p->att("default"), $p->att("advanced"), $p->children_text("short"), $p->children_text("description"), $p->children_text("since"), $p->children_text("example"), $check);
 	return @data;
 }
 
diff --git a/src/core/config.xml b/src/core/config.xml
index 287b9d3..5789b49 100644
--- a/src/core/config.xml
+++ b/src/core/config.xml
@@ -1,5 +1,14 @@
 <?xml version='1.0' standalone="yes" ?>
 <config>
+
+	<option name="hub_enabled" type="boolean" default="1">
+		<short>Is server enabled</short>
+		<description>
+			Use this to disable the hub for a while.
+		</description>
+		<since>0.1.3</since>
+	</option>
+
 	<option name="server_port" type="int" default="1511">
 		<check min="1" max="65535" />
 		<since>0.1.0</since>
@@ -60,14 +69,6 @@
 		<since>0.3.0</since>
 	</option>
 
-	<option name="hub_enabled" type="boolean" default="1">
-		<short>Is server enabled</short>
-		<description>
-			Use this to disable the hub for a while.
-		</description>
-		<since>0.1.3</since>
-	</option>
-
 	<option name="show_banner" type="boolean" default="1">
 		<short>Show banner on connect</short>
 		<description>
@@ -86,7 +87,7 @@
 	</option>
 
 	<option name="max_users" type="int" default="500">
-		<check min="1" />
+		<check min="1" max="1048576" />
 		<short>Maximum number of users allowed on the hub</short>
 		<description>
 			The maximum amount of users allowed on the hub.
@@ -327,7 +328,7 @@
 	</option>
 
 	<option name="flood_ctl_interval" type="int" default="0">
-		<check min="0" max="60" />
+		<check min="1" max="60" />
 		<short>Time interval in seconds for flood control check.</short>
 		<description>
 			This is the time interval that will be used for all flood control calculations.
diff --git a/src/core/gen_config.c b/src/core/gen_config.c
index f76246f..3f8fa6d 100644
--- a/src/core/gen_config.c
+++ b/src/core/gen_config.c
@@ -2,170 +2,898 @@
 
 void config_defaults(struct hub_config* config)
 {
-	DEFAULT_INTEGER(server_port, 1511);
-	DEFAULT_STRING (server_bind_addr, "any");
-	DEFAULT_INTEGER(server_listen_backlog, 50);
-	DEFAULT_STRING (server_alt_ports, "");
-	DEFAULT_BOOLEAN(hub_enabled, 1);
-	DEFAULT_BOOLEAN(show_banner, 1);
-	DEFAULT_BOOLEAN(show_banner_sys_info, 1);
-	DEFAULT_INTEGER(max_users, 500);
-	DEFAULT_BOOLEAN(registered_users_only, 0);
-	DEFAULT_BOOLEAN(obsolete_clients, 0);
-	DEFAULT_BOOLEAN(chat_only, 0);
-	DEFAULT_BOOLEAN(chat_is_privileged, 0);
-	DEFAULT_STRING (hub_name, "uhub");
-	DEFAULT_STRING (hub_description, "no description");
-	DEFAULT_INTEGER(max_recv_buffer, 4096);
-	DEFAULT_INTEGER(max_send_buffer, 131072);
-	DEFAULT_INTEGER(max_send_buffer_soft, 98304);
-	DEFAULT_BOOLEAN(low_bandwidth_mode, 0);
-	DEFAULT_INTEGER(max_chat_history, 20);
-	DEFAULT_INTEGER(max_logout_log, 20);
-	DEFAULT_INTEGER(limit_max_hubs_user, 10);
-	DEFAULT_INTEGER(limit_max_hubs_reg, 10);
-	DEFAULT_INTEGER(limit_max_hubs_op, 10);
-	DEFAULT_INTEGER(limit_max_hubs, 25);
-	DEFAULT_INTEGER(limit_min_hubs_user, 0);
-	DEFAULT_INTEGER(limit_min_hubs_reg, 0);
-	DEFAULT_INTEGER(limit_min_hubs_op, 0);
-	DEFAULT_INTEGER(limit_min_share, 0);
-	DEFAULT_INTEGER(limit_max_share, 0);
-	DEFAULT_INTEGER(limit_min_slots, 0);
-	DEFAULT_INTEGER(limit_max_slots, 0);
-	DEFAULT_INTEGER(flood_ctl_interval, 0);
-	DEFAULT_INTEGER(flood_ctl_chat, 0);
-	DEFAULT_INTEGER(flood_ctl_connect, 0);
-	DEFAULT_INTEGER(flood_ctl_search, 0);
-	DEFAULT_INTEGER(flood_ctl_update, 0);
-	DEFAULT_INTEGER(flood_ctl_extras, 0);
-	DEFAULT_BOOLEAN(tls_enable, 0);
-	DEFAULT_BOOLEAN(tls_require, 0);
-	DEFAULT_STRING (tls_certificate, "");
-	DEFAULT_STRING (tls_private_key, "");
-	DEFAULT_STRING (file_motd, "");
-	DEFAULT_STRING (file_acl, "");
-	DEFAULT_STRING (file_rules, "");
-	DEFAULT_STRING (msg_hub_full, "Hub is full");
-	DEFAULT_STRING (msg_hub_disabled, "Hub is disabled");
-	DEFAULT_STRING (msg_hub_registered_users_only, "Hub is for registered users only");
-	DEFAULT_STRING (msg_inf_error_nick_missing, "No nickname given");
-	DEFAULT_STRING (msg_inf_error_nick_multiple, "Multiple nicknames given");
-	DEFAULT_STRING (msg_inf_error_nick_invalid, "Nickname is invalid");
-	DEFAULT_STRING (msg_inf_error_nick_long, "Nickname too long");
-	DEFAULT_STRING (msg_inf_error_nick_short, "Nickname too short");
-	DEFAULT_STRING (msg_inf_error_nick_spaces, "Nickname cannot start with spaces");
-	DEFAULT_STRING (msg_inf_error_nick_bad_chars, "Nickname contains invalid characters");
-	DEFAULT_STRING (msg_inf_error_nick_not_utf8, "Nickname is not valid UTF-8");
-	DEFAULT_STRING (msg_inf_error_nick_taken, "Nickname is already in use");
-	DEFAULT_STRING (msg_inf_error_nick_restricted, "Nickname cannot be used on this hub");
-	DEFAULT_STRING (msg_inf_error_cid_invalid, "CID is not valid");
-	DEFAULT_STRING (msg_inf_error_cid_missing, "CID is not specified");
-	DEFAULT_STRING (msg_inf_error_cid_taken, "CID is taken");
-	DEFAULT_STRING (msg_inf_error_pid_missing, "PID is not specified");
-	DEFAULT_STRING (msg_inf_error_pid_invalid, "PID is invalid");
-	DEFAULT_STRING (msg_ban_permanently, "Banned permanently");
-	DEFAULT_STRING (msg_ban_temporarily, "Banned temporarily");
-	DEFAULT_STRING (msg_auth_invalid_password, "Password is wrong");
-	DEFAULT_STRING (msg_auth_user_not_found, "User not found in password database");
-	DEFAULT_STRING (msg_error_no_memory, "No memory");
-	DEFAULT_STRING (msg_user_share_size_low, "User is not sharing enough");
-	DEFAULT_STRING (msg_user_share_size_high, "User is sharing too much");
-	DEFAULT_STRING (msg_user_slots_low, "User have too few upload slots.");
-	DEFAULT_STRING (msg_user_slots_high, "User have too many upload slots.");
-	DEFAULT_STRING (msg_user_hub_limit_low, "User is on too few hubs.");
-	DEFAULT_STRING (msg_user_hub_limit_high, "User is on too many hubs.");
-	DEFAULT_STRING (msg_user_flood_chat, "Chat flood detected, messages are dropped.");
-	DEFAULT_STRING (msg_user_flood_connect, "Connect flood detected, connection refused.");
-	DEFAULT_STRING (msg_user_flood_search, "Search flood detected, search is stopped.");
-	DEFAULT_STRING (msg_user_flood_update, "Update flood detected.");
-	DEFAULT_STRING (msg_user_flood_extras, "Flood detected.");
-	DEFAULT_STRING (msg_proto_no_common_hash, "No common hash algorithm.");
-	DEFAULT_STRING (msg_proto_obsolete_adc0, "Client is using an obsolete ADC protocol version.");
+	config->hub_enabled = 1;
+	config->server_port = 1511;
+	config->server_bind_addr = hub_strdup("any");
+	config->server_listen_backlog = 50;
+	config->server_alt_ports = hub_strdup("");
+	config->show_banner = 1;
+	config->show_banner_sys_info = 1;
+	config->max_users = 500;
+	config->registered_users_only = 0;
+	config->obsolete_clients = 0;
+	config->chat_only = 0;
+	config->chat_is_privileged = 0;
+	config->hub_name = hub_strdup("uhub");
+	config->hub_description = hub_strdup("no description");
+	config->max_recv_buffer = 4096;
+	config->max_send_buffer = 131072;
+	config->max_send_buffer_soft = 98304;
+	config->low_bandwidth_mode = 0;
+	config->max_chat_history = 20;
+	config->max_logout_log = 20;
+	config->limit_max_hubs_user = 10;
+	config->limit_max_hubs_reg = 10;
+	config->limit_max_hubs_op = 10;
+	config->limit_max_hubs = 25;
+	config->limit_min_hubs_user = 0;
+	config->limit_min_hubs_reg = 0;
+	config->limit_min_hubs_op = 0;
+	config->limit_min_share = 0;
+	config->limit_max_share = 0;
+	config->limit_min_slots = 0;
+	config->limit_max_slots = 0;
+	config->flood_ctl_interval = 0;
+	config->flood_ctl_chat = 0;
+	config->flood_ctl_connect = 0;
+	config->flood_ctl_search = 0;
+	config->flood_ctl_update = 0;
+	config->flood_ctl_extras = 0;
+	config->tls_enable = 0;
+	config->tls_require = 0;
+	config->tls_certificate = hub_strdup("");
+	config->tls_private_key = hub_strdup("");
+	config->file_motd = hub_strdup("");
+	config->file_acl = hub_strdup("");
+	config->file_rules = hub_strdup("");
+	config->msg_hub_full = hub_strdup("Hub is full");
+	config->msg_hub_disabled = hub_strdup("Hub is disabled");
+	config->msg_hub_registered_users_only = hub_strdup("Hub is for registered users only");
+	config->msg_inf_error_nick_missing = hub_strdup("No nickname given");
+	config->msg_inf_error_nick_multiple = hub_strdup("Multiple nicknames given");
+	config->msg_inf_error_nick_invalid = hub_strdup("Nickname is invalid");
+	config->msg_inf_error_nick_long = hub_strdup("Nickname too long");
+	config->msg_inf_error_nick_short = hub_strdup("Nickname too short");
+	config->msg_inf_error_nick_spaces = hub_strdup("Nickname cannot start with spaces");
+	config->msg_inf_error_nick_bad_chars = hub_strdup("Nickname contains invalid characters");
+	config->msg_inf_error_nick_not_utf8 = hub_strdup("Nickname is not valid UTF-8");
+	config->msg_inf_error_nick_taken = hub_strdup("Nickname is already in use");
+	config->msg_inf_error_nick_restricted = hub_strdup("Nickname cannot be used on this hub");
+	config->msg_inf_error_cid_invalid = hub_strdup("CID is not valid");
+	config->msg_inf_error_cid_missing = hub_strdup("CID is not specified");
+	config->msg_inf_error_cid_taken = hub_strdup("CID is taken");
+	config->msg_inf_error_pid_missing = hub_strdup("PID is not specified");
+	config->msg_inf_error_pid_invalid = hub_strdup("PID is invalid");
+	config->msg_ban_permanently = hub_strdup("Banned permanently");
+	config->msg_ban_temporarily = hub_strdup("Banned temporarily");
+	config->msg_auth_invalid_password = hub_strdup("Password is wrong");
+	config->msg_auth_user_not_found = hub_strdup("User not found in password database");
+	config->msg_error_no_memory = hub_strdup("No memory");
+	config->msg_user_share_size_low = hub_strdup("User is not sharing enough");
+	config->msg_user_share_size_high = hub_strdup("User is sharing too much");
+	config->msg_user_slots_low = hub_strdup("User have too few upload slots.");
+	config->msg_user_slots_high = hub_strdup("User have too many upload slots.");
+	config->msg_user_hub_limit_low = hub_strdup("User is on too few hubs.");
+	config->msg_user_hub_limit_high = hub_strdup("User is on too many hubs.");
+	config->msg_user_flood_chat = hub_strdup("Chat flood detected, messages are dropped.");
+	config->msg_user_flood_connect = hub_strdup("Connect flood detected, connection refused.");
+	config->msg_user_flood_search = hub_strdup("Search flood detected, search is stopped.");
+	config->msg_user_flood_update = hub_strdup("Update flood detected.");
+	config->msg_user_flood_extras = hub_strdup("Flood detected.");
+	config->msg_proto_no_common_hash = hub_strdup("No common hash algorithm.");
+	config->msg_proto_obsolete_adc0 = hub_strdup("Client is using an obsolete ADC protocol version.");
 }
 
 static int apply_config(struct hub_config* config, char* key, char* data, int line_count)
 {
-	GET_INT (server_port);
-	GET_STR (server_bind_addr);
-	GET_INT (server_listen_backlog);
-	GET_STR (server_alt_ports);
-	GET_BOOL(hub_enabled);
-	GET_BOOL(show_banner);
-	GET_BOOL(show_banner_sys_info);
-	GET_INT (max_users);
-	GET_BOOL(registered_users_only);
-	GET_BOOL(obsolete_clients);
-	GET_BOOL(chat_only);
-	GET_BOOL(chat_is_privileged);
-	GET_STR (hub_name);
-	GET_STR (hub_description);
-	GET_INT (max_recv_buffer);
-	GET_INT (max_send_buffer);
-	GET_INT (max_send_buffer_soft);
-	GET_BOOL(low_bandwidth_mode);
-	GET_INT (max_chat_history);
-	GET_INT (max_logout_log);
-	GET_INT (limit_max_hubs_user);
-	GET_INT (limit_max_hubs_reg);
-	GET_INT (limit_max_hubs_op);
-	GET_INT (limit_max_hubs);
-	GET_INT (limit_min_hubs_user);
-	GET_INT (limit_min_hubs_reg);
-	GET_INT (limit_min_hubs_op);
-	GET_INT (limit_min_share);
-	GET_INT (limit_max_share);
-	GET_INT (limit_min_slots);
-	GET_INT (limit_max_slots);
-	GET_INT (flood_ctl_interval);
-	GET_INT (flood_ctl_chat);
-	GET_INT (flood_ctl_connect);
-	GET_INT (flood_ctl_search);
-	GET_INT (flood_ctl_update);
-	GET_INT (flood_ctl_extras);
-	GET_BOOL(tls_enable);
-	GET_BOOL(tls_require);
-	GET_STR (tls_certificate);
-	GET_STR (tls_private_key);
-	GET_STR (file_motd);
-	GET_STR (file_acl);
-	GET_STR (file_rules);
-	GET_STR (msg_hub_full);
-	GET_STR (msg_hub_disabled);
-	GET_STR (msg_hub_registered_users_only);
-	GET_STR (msg_inf_error_nick_missing);
-	GET_STR (msg_inf_error_nick_multiple);
-	GET_STR (msg_inf_error_nick_invalid);
-	GET_STR (msg_inf_error_nick_long);
-	GET_STR (msg_inf_error_nick_short);
-	GET_STR (msg_inf_error_nick_spaces);
-	GET_STR (msg_inf_error_nick_bad_chars);
-	GET_STR (msg_inf_error_nick_not_utf8);
-	GET_STR (msg_inf_error_nick_taken);
-	GET_STR (msg_inf_error_nick_restricted);
-	GET_STR (msg_inf_error_cid_invalid);
-	GET_STR (msg_inf_error_cid_missing);
-	GET_STR (msg_inf_error_cid_taken);
-	GET_STR (msg_inf_error_pid_missing);
-	GET_STR (msg_inf_error_pid_invalid);
-	GET_STR (msg_ban_permanently);
-	GET_STR (msg_ban_temporarily);
-	GET_STR (msg_auth_invalid_password);
-	GET_STR (msg_auth_user_not_found);
-	GET_STR (msg_error_no_memory);
-	GET_STR (msg_user_share_size_low);
-	GET_STR (msg_user_share_size_high);
-	GET_STR (msg_user_slots_low);
-	GET_STR (msg_user_slots_high);
-	GET_STR (msg_user_hub_limit_low);
-	GET_STR (msg_user_hub_limit_high);
-	GET_STR (msg_user_flood_chat);
-	GET_STR (msg_user_flood_connect);
-	GET_STR (msg_user_flood_search);
-	GET_STR (msg_user_flood_update);
-	GET_STR (msg_user_flood_extras);
-	GET_STR (msg_proto_no_common_hash);
-	GET_STR (msg_proto_obsolete_adc0);
+	int max = 0;
+	int min = 0;
+
+	if (!strcmp(key, "hub_enabled"))
+	{
+		if (!apply_boolean(key, data, &config->hub_enabled))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "server_port"))
+	{
+		if (!apply_integer(key, data, &config->server_port, 0, 0))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "server_bind_addr"))
+	{
+		if (!apply_string(key, data, &config->server_bind_addr, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "server_listen_backlog"))
+	{
+		if (!apply_integer(key, data, &config->server_listen_backlog, 0, 0))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "server_alt_ports"))
+	{
+		if (!apply_string(key, data, &config->server_alt_ports, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "show_banner"))
+	{
+		if (!apply_boolean(key, data, &config->show_banner))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "show_banner_sys_info"))
+	{
+		if (!apply_boolean(key, data, &config->show_banner_sys_info))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "max_users"))
+	{
+		min = 1;
+		max = 1048576;
+		if (!apply_integer(key, data, &config->max_users, &min, &max))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "registered_users_only"))
+	{
+		if (!apply_boolean(key, data, &config->registered_users_only))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "obsolete_clients"))
+	{
+		if (!apply_boolean(key, data, &config->obsolete_clients))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "chat_only"))
+	{
+		if (!apply_boolean(key, data, &config->chat_only))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "chat_is_privileged"))
+	{
+		if (!apply_boolean(key, data, &config->chat_is_privileged))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "hub_name"))
+	{
+		if (!apply_string(key, data, &config->hub_name, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "hub_description"))
+	{
+		if (!apply_string(key, data, &config->hub_description, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "max_recv_buffer"))
+	{
+		if (!apply_integer(key, data, &config->max_recv_buffer, 0, 0))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "max_send_buffer"))
+	{
+		if (!apply_integer(key, data, &config->max_send_buffer, 0, 0))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "max_send_buffer_soft"))
+	{
+		if (!apply_integer(key, data, &config->max_send_buffer_soft, 0, 0))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "low_bandwidth_mode"))
+	{
+		if (!apply_boolean(key, data, &config->low_bandwidth_mode))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "max_chat_history"))
+	{
+		if (!apply_integer(key, data, &config->max_chat_history, 0, 0))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "max_logout_log"))
+	{
+		if (!apply_integer(key, data, &config->max_logout_log, 0, 0))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "limit_max_hubs_user"))
+	{
+		if (!apply_integer(key, data, &config->limit_max_hubs_user, 0, 0))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "limit_max_hubs_reg"))
+	{
+		if (!apply_integer(key, data, &config->limit_max_hubs_reg, 0, 0))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "limit_max_hubs_op"))
+	{
+		if (!apply_integer(key, data, &config->limit_max_hubs_op, 0, 0))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "limit_max_hubs"))
+	{
+		if (!apply_integer(key, data, &config->limit_max_hubs, 0, 0))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "limit_min_hubs_user"))
+	{
+		if (!apply_integer(key, data, &config->limit_min_hubs_user, 0, 0))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "limit_min_hubs_reg"))
+	{
+		if (!apply_integer(key, data, &config->limit_min_hubs_reg, 0, 0))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "limit_min_hubs_op"))
+	{
+		if (!apply_integer(key, data, &config->limit_min_hubs_op, 0, 0))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "limit_min_share"))
+	{
+		min = 0;
+		if (!apply_integer(key, data, &config->limit_min_share, &min, 0))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "limit_max_share"))
+	{
+		if (!apply_integer(key, data, &config->limit_max_share, 0, 0))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "limit_min_slots"))
+	{
+		if (!apply_integer(key, data, &config->limit_min_slots, 0, 0))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "limit_max_slots"))
+	{
+		if (!apply_integer(key, data, &config->limit_max_slots, 0, 0))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "flood_ctl_interval"))
+	{
+		min = 1;
+		max = 60;
+		if (!apply_integer(key, data, &config->flood_ctl_interval, &min, &max))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "flood_ctl_chat"))
+	{
+		if (!apply_integer(key, data, &config->flood_ctl_chat, 0, 0))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "flood_ctl_connect"))
+	{
+		if (!apply_integer(key, data, &config->flood_ctl_connect, 0, 0))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "flood_ctl_search"))
+	{
+		if (!apply_integer(key, data, &config->flood_ctl_search, 0, 0))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "flood_ctl_update"))
+	{
+		if (!apply_integer(key, data, &config->flood_ctl_update, 0, 0))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "flood_ctl_extras"))
+	{
+		if (!apply_integer(key, data, &config->flood_ctl_extras, 0, 0))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "tls_enable"))
+	{
+		if (!apply_boolean(key, data, &config->tls_enable))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "tls_require"))
+	{
+		if (!apply_boolean(key, data, &config->tls_require))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "tls_certificate"))
+	{
+		if (!apply_string(key, data, &config->tls_certificate, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "tls_private_key"))
+	{
+		if (!apply_string(key, data, &config->tls_private_key, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "file_motd"))
+	{
+		if (!apply_string(key, data, &config->file_motd, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "file_acl"))
+	{
+		if (!apply_string(key, data, &config->file_acl, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "file_rules"))
+	{
+		if (!apply_string(key, data, &config->file_rules, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_hub_full"))
+	{
+		if (!apply_string(key, data, &config->msg_hub_full, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_hub_disabled"))
+	{
+		if (!apply_string(key, data, &config->msg_hub_disabled, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_hub_registered_users_only"))
+	{
+		if (!apply_string(key, data, &config->msg_hub_registered_users_only, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_inf_error_nick_missing"))
+	{
+		if (!apply_string(key, data, &config->msg_inf_error_nick_missing, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_inf_error_nick_multiple"))
+	{
+		if (!apply_string(key, data, &config->msg_inf_error_nick_multiple, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_inf_error_nick_invalid"))
+	{
+		if (!apply_string(key, data, &config->msg_inf_error_nick_invalid, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_inf_error_nick_long"))
+	{
+		if (!apply_string(key, data, &config->msg_inf_error_nick_long, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_inf_error_nick_short"))
+	{
+		if (!apply_string(key, data, &config->msg_inf_error_nick_short, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_inf_error_nick_spaces"))
+	{
+		if (!apply_string(key, data, &config->msg_inf_error_nick_spaces, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_inf_error_nick_bad_chars"))
+	{
+		if (!apply_string(key, data, &config->msg_inf_error_nick_bad_chars, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_inf_error_nick_not_utf8"))
+	{
+		if (!apply_string(key, data, &config->msg_inf_error_nick_not_utf8, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_inf_error_nick_taken"))
+	{
+		if (!apply_string(key, data, &config->msg_inf_error_nick_taken, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_inf_error_nick_restricted"))
+	{
+		if (!apply_string(key, data, &config->msg_inf_error_nick_restricted, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_inf_error_cid_invalid"))
+	{
+		if (!apply_string(key, data, &config->msg_inf_error_cid_invalid, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_inf_error_cid_missing"))
+	{
+		if (!apply_string(key, data, &config->msg_inf_error_cid_missing, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_inf_error_cid_taken"))
+	{
+		if (!apply_string(key, data, &config->msg_inf_error_cid_taken, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_inf_error_pid_missing"))
+	{
+		if (!apply_string(key, data, &config->msg_inf_error_pid_missing, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_inf_error_pid_invalid"))
+	{
+		if (!apply_string(key, data, &config->msg_inf_error_pid_invalid, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_ban_permanently"))
+	{
+		if (!apply_string(key, data, &config->msg_ban_permanently, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_ban_temporarily"))
+	{
+		if (!apply_string(key, data, &config->msg_ban_temporarily, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_auth_invalid_password"))
+	{
+		if (!apply_string(key, data, &config->msg_auth_invalid_password, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_auth_user_not_found"))
+	{
+		if (!apply_string(key, data, &config->msg_auth_user_not_found, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_error_no_memory"))
+	{
+		if (!apply_string(key, data, &config->msg_error_no_memory, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_user_share_size_low"))
+	{
+		if (!apply_string(key, data, &config->msg_user_share_size_low, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_user_share_size_high"))
+	{
+		if (!apply_string(key, data, &config->msg_user_share_size_high, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_user_slots_low"))
+	{
+		if (!apply_string(key, data, &config->msg_user_slots_low, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_user_slots_high"))
+	{
+		if (!apply_string(key, data, &config->msg_user_slots_high, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_user_hub_limit_low"))
+	{
+		if (!apply_string(key, data, &config->msg_user_hub_limit_low, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_user_hub_limit_high"))
+	{
+		if (!apply_string(key, data, &config->msg_user_hub_limit_high, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_user_flood_chat"))
+	{
+		if (!apply_string(key, data, &config->msg_user_flood_chat, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_user_flood_connect"))
+	{
+		if (!apply_string(key, data, &config->msg_user_flood_connect, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_user_flood_search"))
+	{
+		if (!apply_string(key, data, &config->msg_user_flood_search, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_user_flood_update"))
+	{
+		if (!apply_string(key, data, &config->msg_user_flood_update, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_user_flood_extras"))
+	{
+		if (!apply_string(key, data, &config->msg_user_flood_extras, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_proto_no_common_hash"))
+	{
+		if (!apply_string(key, data, &config->msg_proto_no_common_hash, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
+	if (!strcmp(key, "msg_proto_obsolete_adc0"))
+	{
+		if (!apply_string(key, data, &config->msg_proto_obsolete_adc0, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
 	/* Still here -- unknown directive */
 	LOG_ERROR("Unknown configuration directive: '%s'", key);
 		return -1;
@@ -174,133 +902,338 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 void free_config(struct hub_config* config)
 {
 	hub_free(config->server_bind_addr);
+
 	hub_free(config->server_alt_ports);
+
 	hub_free(config->hub_name);
+
 	hub_free(config->hub_description);
+
 	hub_free(config->tls_certificate);
+
 	hub_free(config->tls_private_key);
+
 	hub_free(config->file_motd);
+
 	hub_free(config->file_acl);
+
 	hub_free(config->file_rules);
+
 	hub_free(config->msg_hub_full);
+
 	hub_free(config->msg_hub_disabled);
+
 	hub_free(config->msg_hub_registered_users_only);
+
 	hub_free(config->msg_inf_error_nick_missing);
+
 	hub_free(config->msg_inf_error_nick_multiple);
+
 	hub_free(config->msg_inf_error_nick_invalid);
+
 	hub_free(config->msg_inf_error_nick_long);
+
 	hub_free(config->msg_inf_error_nick_short);
+
 	hub_free(config->msg_inf_error_nick_spaces);
+
 	hub_free(config->msg_inf_error_nick_bad_chars);
+
 	hub_free(config->msg_inf_error_nick_not_utf8);
+
 	hub_free(config->msg_inf_error_nick_taken);
+
 	hub_free(config->msg_inf_error_nick_restricted);
+
 	hub_free(config->msg_inf_error_cid_invalid);
+
 	hub_free(config->msg_inf_error_cid_missing);
+
 	hub_free(config->msg_inf_error_cid_taken);
+
 	hub_free(config->msg_inf_error_pid_missing);
+
 	hub_free(config->msg_inf_error_pid_invalid);
+
 	hub_free(config->msg_ban_permanently);
+
 	hub_free(config->msg_ban_temporarily);
+
 	hub_free(config->msg_auth_invalid_password);
+
 	hub_free(config->msg_auth_user_not_found);
+
 	hub_free(config->msg_error_no_memory);
+
 	hub_free(config->msg_user_share_size_low);
+
 	hub_free(config->msg_user_share_size_high);
+
 	hub_free(config->msg_user_slots_low);
+
 	hub_free(config->msg_user_slots_high);
+
 	hub_free(config->msg_user_hub_limit_low);
+
 	hub_free(config->msg_user_hub_limit_high);
+
 	hub_free(config->msg_user_flood_chat);
+
 	hub_free(config->msg_user_flood_connect);
+
 	hub_free(config->msg_user_flood_search);
+
 	hub_free(config->msg_user_flood_update);
+
 	hub_free(config->msg_user_flood_extras);
+
 	hub_free(config->msg_proto_no_common_hash);
+
 	hub_free(config->msg_proto_obsolete_adc0);
+
 }
 
 void dump_config(struct hub_config* config, int ignore_defaults)
 {
-	DUMP_INT (server_port, 1511);
-	DUMP_STR(server_bind_addr, "any");
-	DUMP_INT (server_listen_backlog, 50);
-	DUMP_STR(server_alt_ports, "");
-	DUMP_BOOL(hub_enabled, 1);
-	DUMP_BOOL(show_banner, 1);
-	DUMP_BOOL(show_banner_sys_info, 1);
-	DUMP_INT (max_users, 500);
-	DUMP_BOOL(registered_users_only, 0);
-	DUMP_BOOL(obsolete_clients, 0);
-	DUMP_BOOL(chat_only, 0);
-	DUMP_BOOL(chat_is_privileged, 0);
-	DUMP_STR(hub_name, "uhub");
-	DUMP_STR(hub_description, "no description");
-	DUMP_INT (max_recv_buffer, 4096);
-	DUMP_INT (max_send_buffer, 131072);
-	DUMP_INT (max_send_buffer_soft, 98304);
-	DUMP_BOOL(low_bandwidth_mode, 0);
-	DUMP_INT (max_chat_history, 20);
-	DUMP_INT (max_logout_log, 20);
-	DUMP_INT (limit_max_hubs_user, 10);
-	DUMP_INT (limit_max_hubs_reg, 10);
-	DUMP_INT (limit_max_hubs_op, 10);
-	DUMP_INT (limit_max_hubs, 25);
-	DUMP_INT (limit_min_hubs_user, 0);
-	DUMP_INT (limit_min_hubs_reg, 0);
-	DUMP_INT (limit_min_hubs_op, 0);
-	DUMP_INT (limit_min_share, 0);
-	DUMP_INT (limit_max_share, 0);
-	DUMP_INT (limit_min_slots, 0);
-	DUMP_INT (limit_max_slots, 0);
-	DUMP_INT (flood_ctl_interval, 0);
-	DUMP_INT (flood_ctl_chat, 0);
-	DUMP_INT (flood_ctl_connect, 0);
-	DUMP_INT (flood_ctl_search, 0);
-	DUMP_INT (flood_ctl_update, 0);
-	DUMP_INT (flood_ctl_extras, 0);
-	DUMP_BOOL(tls_enable, 0);
-	DUMP_BOOL(tls_require, 0);
-	DUMP_STR(tls_certificate, "");
-	DUMP_STR(tls_private_key, "");
-	DUMP_STR(file_motd, "");
-	DUMP_STR(file_acl, "");
-	DUMP_STR(file_rules, "");
-	DUMP_STR(msg_hub_full, "Hub is full");
-	DUMP_STR(msg_hub_disabled, "Hub is disabled");
-	DUMP_STR(msg_hub_registered_users_only, "Hub is for registered users only");
-	DUMP_STR(msg_inf_error_nick_missing, "No nickname given");
-	DUMP_STR(msg_inf_error_nick_multiple, "Multiple nicknames given");
-	DUMP_STR(msg_inf_error_nick_invalid, "Nickname is invalid");
-	DUMP_STR(msg_inf_error_nick_long, "Nickname too long");
-	DUMP_STR(msg_inf_error_nick_short, "Nickname too short");
-	DUMP_STR(msg_inf_error_nick_spaces, "Nickname cannot start with spaces");
-	DUMP_STR(msg_inf_error_nick_bad_chars, "Nickname contains invalid characters");
-	DUMP_STR(msg_inf_error_nick_not_utf8, "Nickname is not valid UTF-8");
-	DUMP_STR(msg_inf_error_nick_taken, "Nickname is already in use");
-	DUMP_STR(msg_inf_error_nick_restricted, "Nickname cannot be used on this hub");
-	DUMP_STR(msg_inf_error_cid_invalid, "CID is not valid");
-	DUMP_STR(msg_inf_error_cid_missing, "CID is not specified");
-	DUMP_STR(msg_inf_error_cid_taken, "CID is taken");
-	DUMP_STR(msg_inf_error_pid_missing, "PID is not specified");
-	DUMP_STR(msg_inf_error_pid_invalid, "PID is invalid");
-	DUMP_STR(msg_ban_permanently, "Banned permanently");
-	DUMP_STR(msg_ban_temporarily, "Banned temporarily");
-	DUMP_STR(msg_auth_invalid_password, "Password is wrong");
-	DUMP_STR(msg_auth_user_not_found, "User not found in password database");
-	DUMP_STR(msg_error_no_memory, "No memory");
-	DUMP_STR(msg_user_share_size_low, "User is not sharing enough");
-	DUMP_STR(msg_user_share_size_high, "User is sharing too much");
-	DUMP_STR(msg_user_slots_low, "User have too few upload slots.");
-	DUMP_STR(msg_user_slots_high, "User have too many upload slots.");
-	DUMP_STR(msg_user_hub_limit_low, "User is on too few hubs.");
-	DUMP_STR(msg_user_hub_limit_high, "User is on too many hubs.");
-	DUMP_STR(msg_user_flood_chat, "Chat flood detected, messages are dropped.");
-	DUMP_STR(msg_user_flood_connect, "Connect flood detected, connection refused.");
-	DUMP_STR(msg_user_flood_search, "Search flood detected, search is stopped.");
-	DUMP_STR(msg_user_flood_update, "Update flood detected.");
-	DUMP_STR(msg_user_flood_extras, "Flood detected.");
-	DUMP_STR(msg_proto_no_common_hash, "No common hash algorithm.");
-	DUMP_STR(msg_proto_obsolete_adc0, "Client is using an obsolete ADC protocol version.");
+	if (!ignore_defaults || config->hub_enabled != 1)
+		fprintf(stdout, "hub_enabled = %s\n", config->hub_enabled ? "yes" : "no");
+
+	if (!ignore_defaults || config->server_port != 1511)
+		fprintf(stdout, "server_port = %d\n", config->server_port);
+
+	if (!ignore_defaults || strcmp(config->server_bind_addr, "any") != 0)
+		fprintf(stdout, "server_bind_addr = \"%s\"\n", config->server_bind_addr);
+
+	if (!ignore_defaults || config->server_listen_backlog != 50)
+		fprintf(stdout, "server_listen_backlog = %d\n", config->server_listen_backlog);
+
+	if (!ignore_defaults || strcmp(config->server_alt_ports, "") != 0)
+		fprintf(stdout, "server_alt_ports = \"%s\"\n", config->server_alt_ports);
+
+	if (!ignore_defaults || config->show_banner != 1)
+		fprintf(stdout, "show_banner = %s\n", config->show_banner ? "yes" : "no");
+
+	if (!ignore_defaults || config->show_banner_sys_info != 1)
+		fprintf(stdout, "show_banner_sys_info = %s\n", config->show_banner_sys_info ? "yes" : "no");
+
+	if (!ignore_defaults || config->max_users != 500)
+		fprintf(stdout, "max_users = %d\n", config->max_users);
+
+	if (!ignore_defaults || config->registered_users_only != 0)
+		fprintf(stdout, "registered_users_only = %s\n", config->registered_users_only ? "yes" : "no");
+
+	if (!ignore_defaults || config->obsolete_clients != 0)
+		fprintf(stdout, "obsolete_clients = %s\n", config->obsolete_clients ? "yes" : "no");
+
+	if (!ignore_defaults || config->chat_only != 0)
+		fprintf(stdout, "chat_only = %s\n", config->chat_only ? "yes" : "no");
+
+	if (!ignore_defaults || config->chat_is_privileged != 0)
+		fprintf(stdout, "chat_is_privileged = %s\n", config->chat_is_privileged ? "yes" : "no");
+
+	if (!ignore_defaults || strcmp(config->hub_name, "uhub") != 0)
+		fprintf(stdout, "hub_name = \"%s\"\n", config->hub_name);
+
+	if (!ignore_defaults || strcmp(config->hub_description, "no description") != 0)
+		fprintf(stdout, "hub_description = \"%s\"\n", config->hub_description);
+
+	if (!ignore_defaults || config->max_recv_buffer != 4096)
+		fprintf(stdout, "max_recv_buffer = %d\n", config->max_recv_buffer);
+
+	if (!ignore_defaults || config->max_send_buffer != 131072)
+		fprintf(stdout, "max_send_buffer = %d\n", config->max_send_buffer);
+
+	if (!ignore_defaults || config->max_send_buffer_soft != 98304)
+		fprintf(stdout, "max_send_buffer_soft = %d\n", config->max_send_buffer_soft);
+
+	if (!ignore_defaults || config->low_bandwidth_mode != 0)
+		fprintf(stdout, "low_bandwidth_mode = %s\n", config->low_bandwidth_mode ? "yes" : "no");
+
+	if (!ignore_defaults || config->max_chat_history != 20)
+		fprintf(stdout, "max_chat_history = %d\n", config->max_chat_history);
+
+	if (!ignore_defaults || config->max_logout_log != 20)
+		fprintf(stdout, "max_logout_log = %d\n", config->max_logout_log);
+
+	if (!ignore_defaults || config->limit_max_hubs_user != 10)
+		fprintf(stdout, "limit_max_hubs_user = %d\n", config->limit_max_hubs_user);
+
+	if (!ignore_defaults || config->limit_max_hubs_reg != 10)
+		fprintf(stdout, "limit_max_hubs_reg = %d\n", config->limit_max_hubs_reg);
+
+	if (!ignore_defaults || config->limit_max_hubs_op != 10)
+		fprintf(stdout, "limit_max_hubs_op = %d\n", config->limit_max_hubs_op);
+
+	if (!ignore_defaults || config->limit_max_hubs != 25)
+		fprintf(stdout, "limit_max_hubs = %d\n", config->limit_max_hubs);
+
+	if (!ignore_defaults || config->limit_min_hubs_user != 0)
+		fprintf(stdout, "limit_min_hubs_user = %d\n", config->limit_min_hubs_user);
+
+	if (!ignore_defaults || config->limit_min_hubs_reg != 0)
+		fprintf(stdout, "limit_min_hubs_reg = %d\n", config->limit_min_hubs_reg);
+
+	if (!ignore_defaults || config->limit_min_hubs_op != 0)
+		fprintf(stdout, "limit_min_hubs_op = %d\n", config->limit_min_hubs_op);
+
+	if (!ignore_defaults || config->limit_min_share != 0)
+		fprintf(stdout, "limit_min_share = %d\n", config->limit_min_share);
+
+	if (!ignore_defaults || config->limit_max_share != 0)
+		fprintf(stdout, "limit_max_share = %d\n", config->limit_max_share);
+
+	if (!ignore_defaults || config->limit_min_slots != 0)
+		fprintf(stdout, "limit_min_slots = %d\n", config->limit_min_slots);
+
+	if (!ignore_defaults || config->limit_max_slots != 0)
+		fprintf(stdout, "limit_max_slots = %d\n", config->limit_max_slots);
+
+	if (!ignore_defaults || config->flood_ctl_interval != 0)
+		fprintf(stdout, "flood_ctl_interval = %d\n", config->flood_ctl_interval);
+
+	if (!ignore_defaults || config->flood_ctl_chat != 0)
+		fprintf(stdout, "flood_ctl_chat = %d\n", config->flood_ctl_chat);
+
+	if (!ignore_defaults || config->flood_ctl_connect != 0)
+		fprintf(stdout, "flood_ctl_connect = %d\n", config->flood_ctl_connect);
+
+	if (!ignore_defaults || config->flood_ctl_search != 0)
+		fprintf(stdout, "flood_ctl_search = %d\n", config->flood_ctl_search);
+
+	if (!ignore_defaults || config->flood_ctl_update != 0)
+		fprintf(stdout, "flood_ctl_update = %d\n", config->flood_ctl_update);
+
+	if (!ignore_defaults || config->flood_ctl_extras != 0)
+		fprintf(stdout, "flood_ctl_extras = %d\n", config->flood_ctl_extras);
+
+	if (!ignore_defaults || config->tls_enable != 0)
+		fprintf(stdout, "tls_enable = %s\n", config->tls_enable ? "yes" : "no");
+
+	if (!ignore_defaults || config->tls_require != 0)
+		fprintf(stdout, "tls_require = %s\n", config->tls_require ? "yes" : "no");
+
+	if (!ignore_defaults || strcmp(config->tls_certificate, "") != 0)
+		fprintf(stdout, "tls_certificate = \"%s\"\n", config->tls_certificate);
+
+	if (!ignore_defaults || strcmp(config->tls_private_key, "") != 0)
+		fprintf(stdout, "tls_private_key = \"%s\"\n", config->tls_private_key);
+
+	if (!ignore_defaults || strcmp(config->file_motd, "") != 0)
+		fprintf(stdout, "file_motd = \"%s\"\n", config->file_motd);
+
+	if (!ignore_defaults || strcmp(config->file_acl, "") != 0)
+		fprintf(stdout, "file_acl = \"%s\"\n", config->file_acl);
+
+	if (!ignore_defaults || strcmp(config->file_rules, "") != 0)
+		fprintf(stdout, "file_rules = \"%s\"\n", config->file_rules);
+
+	if (!ignore_defaults || strcmp(config->msg_hub_full, "Hub is full") != 0)
+		fprintf(stdout, "msg_hub_full = \"%s\"\n", config->msg_hub_full);
+
+	if (!ignore_defaults || strcmp(config->msg_hub_disabled, "Hub is disabled") != 0)
+		fprintf(stdout, "msg_hub_disabled = \"%s\"\n", config->msg_hub_disabled);
+
+	if (!ignore_defaults || strcmp(config->msg_hub_registered_users_only, "Hub is for registered users only") != 0)
+		fprintf(stdout, "msg_hub_registered_users_only = \"%s\"\n", config->msg_hub_registered_users_only);
+
+	if (!ignore_defaults || strcmp(config->msg_inf_error_nick_missing, "No nickname given") != 0)
+		fprintf(stdout, "msg_inf_error_nick_missing = \"%s\"\n", config->msg_inf_error_nick_missing);
+
+	if (!ignore_defaults || strcmp(config->msg_inf_error_nick_multiple, "Multiple nicknames given") != 0)
+		fprintf(stdout, "msg_inf_error_nick_multiple = \"%s\"\n", config->msg_inf_error_nick_multiple);
+
+	if (!ignore_defaults || strcmp(config->msg_inf_error_nick_invalid, "Nickname is invalid") != 0)
+		fprintf(stdout, "msg_inf_error_nick_invalid = \"%s\"\n", config->msg_inf_error_nick_invalid);
+
+	if (!ignore_defaults || strcmp(config->msg_inf_error_nick_long, "Nickname too long") != 0)
+		fprintf(stdout, "msg_inf_error_nick_long = \"%s\"\n", config->msg_inf_error_nick_long);
+
+	if (!ignore_defaults || strcmp(config->msg_inf_error_nick_short, "Nickname too short") != 0)
+		fprintf(stdout, "msg_inf_error_nick_short = \"%s\"\n", config->msg_inf_error_nick_short);
+
+	if (!ignore_defaults || strcmp(config->msg_inf_error_nick_spaces, "Nickname cannot start with spaces") != 0)
+		fprintf(stdout, "msg_inf_error_nick_spaces = \"%s\"\n", config->msg_inf_error_nick_spaces);
+
+	if (!ignore_defaults || strcmp(config->msg_inf_error_nick_bad_chars, "Nickname contains invalid characters") != 0)
+		fprintf(stdout, "msg_inf_error_nick_bad_chars = \"%s\"\n", config->msg_inf_error_nick_bad_chars);
+
+	if (!ignore_defaults || strcmp(config->msg_inf_error_nick_not_utf8, "Nickname is not valid UTF-8") != 0)
+		fprintf(stdout, "msg_inf_error_nick_not_utf8 = \"%s\"\n", config->msg_inf_error_nick_not_utf8);
+
+	if (!ignore_defaults || strcmp(config->msg_inf_error_nick_taken, "Nickname is already in use") != 0)
+		fprintf(stdout, "msg_inf_error_nick_taken = \"%s\"\n", config->msg_inf_error_nick_taken);
+
+	if (!ignore_defaults || strcmp(config->msg_inf_error_nick_restricted, "Nickname cannot be used on this hub") != 0)
+		fprintf(stdout, "msg_inf_error_nick_restricted = \"%s\"\n", config->msg_inf_error_nick_restricted);
+
+	if (!ignore_defaults || strcmp(config->msg_inf_error_cid_invalid, "CID is not valid") != 0)
+		fprintf(stdout, "msg_inf_error_cid_invalid = \"%s\"\n", config->msg_inf_error_cid_invalid);
+
+	if (!ignore_defaults || strcmp(config->msg_inf_error_cid_missing, "CID is not specified") != 0)
+		fprintf(stdout, "msg_inf_error_cid_missing = \"%s\"\n", config->msg_inf_error_cid_missing);
+
+	if (!ignore_defaults || strcmp(config->msg_inf_error_cid_taken, "CID is taken") != 0)
+		fprintf(stdout, "msg_inf_error_cid_taken = \"%s\"\n", config->msg_inf_error_cid_taken);
+
+	if (!ignore_defaults || strcmp(config->msg_inf_error_pid_missing, "PID is not specified") != 0)
+		fprintf(stdout, "msg_inf_error_pid_missing = \"%s\"\n", config->msg_inf_error_pid_missing);
+
+	if (!ignore_defaults || strcmp(config->msg_inf_error_pid_invalid, "PID is invalid") != 0)
+		fprintf(stdout, "msg_inf_error_pid_invalid = \"%s\"\n", config->msg_inf_error_pid_invalid);
+
+	if (!ignore_defaults || strcmp(config->msg_ban_permanently, "Banned permanently") != 0)
+		fprintf(stdout, "msg_ban_permanently = \"%s\"\n", config->msg_ban_permanently);
+
+	if (!ignore_defaults || strcmp(config->msg_ban_temporarily, "Banned temporarily") != 0)
+		fprintf(stdout, "msg_ban_temporarily = \"%s\"\n", config->msg_ban_temporarily);
+
+	if (!ignore_defaults || strcmp(config->msg_auth_invalid_password, "Password is wrong") != 0)
+		fprintf(stdout, "msg_auth_invalid_password = \"%s\"\n", config->msg_auth_invalid_password);
+
+	if (!ignore_defaults || strcmp(config->msg_auth_user_not_found, "User not found in password database") != 0)
+		fprintf(stdout, "msg_auth_user_not_found = \"%s\"\n", config->msg_auth_user_not_found);
+
+	if (!ignore_defaults || strcmp(config->msg_error_no_memory, "No memory") != 0)
+		fprintf(stdout, "msg_error_no_memory = \"%s\"\n", config->msg_error_no_memory);
+
+	if (!ignore_defaults || strcmp(config->msg_user_share_size_low, "User is not sharing enough") != 0)
+		fprintf(stdout, "msg_user_share_size_low = \"%s\"\n", config->msg_user_share_size_low);
+
+	if (!ignore_defaults || strcmp(config->msg_user_share_size_high, "User is sharing too much") != 0)
+		fprintf(stdout, "msg_user_share_size_high = \"%s\"\n", config->msg_user_share_size_high);
+
+	if (!ignore_defaults || strcmp(config->msg_user_slots_low, "User have too few upload slots.") != 0)
+		fprintf(stdout, "msg_user_slots_low = \"%s\"\n", config->msg_user_slots_low);
+
+	if (!ignore_defaults || strcmp(config->msg_user_slots_high, "User have too many upload slots.") != 0)
+		fprintf(stdout, "msg_user_slots_high = \"%s\"\n", config->msg_user_slots_high);
+
+	if (!ignore_defaults || strcmp(config->msg_user_hub_limit_low, "User is on too few hubs.") != 0)
+		fprintf(stdout, "msg_user_hub_limit_low = \"%s\"\n", config->msg_user_hub_limit_low);
+
+	if (!ignore_defaults || strcmp(config->msg_user_hub_limit_high, "User is on too many hubs.") != 0)
+		fprintf(stdout, "msg_user_hub_limit_high = \"%s\"\n", config->msg_user_hub_limit_high);
+
+	if (!ignore_defaults || strcmp(config->msg_user_flood_chat, "Chat flood detected, messages are dropped.") != 0)
+		fprintf(stdout, "msg_user_flood_chat = \"%s\"\n", config->msg_user_flood_chat);
+
+	if (!ignore_defaults || strcmp(config->msg_user_flood_connect, "Connect flood detected, connection refused.") != 0)
+		fprintf(stdout, "msg_user_flood_connect = \"%s\"\n", config->msg_user_flood_connect);
+
+	if (!ignore_defaults || strcmp(config->msg_user_flood_search, "Search flood detected, search is stopped.") != 0)
+		fprintf(stdout, "msg_user_flood_search = \"%s\"\n", config->msg_user_flood_search);
+
+	if (!ignore_defaults || strcmp(config->msg_user_flood_update, "Update flood detected.") != 0)
+		fprintf(stdout, "msg_user_flood_update = \"%s\"\n", config->msg_user_flood_update);
+
+	if (!ignore_defaults || strcmp(config->msg_user_flood_extras, "Flood detected.") != 0)
+		fprintf(stdout, "msg_user_flood_extras = \"%s\"\n", config->msg_user_flood_extras);
+
+	if (!ignore_defaults || strcmp(config->msg_proto_no_common_hash, "No common hash algorithm.") != 0)
+		fprintf(stdout, "msg_proto_no_common_hash = \"%s\"\n", config->msg_proto_no_common_hash);
+
+	if (!ignore_defaults || strcmp(config->msg_proto_obsolete_adc0, "Client is using an obsolete ADC protocol version.") != 0)
+		fprintf(stdout, "msg_proto_obsolete_adc0 = \"%s\"\n", config->msg_proto_obsolete_adc0);
+
 }
 
diff --git a/src/core/gen_config.h b/src/core/gen_config.h
index 6a8b285..bf7fba1 100644
--- a/src/core/gen_config.h
+++ b/src/core/gen_config.h
@@ -2,85 +2,3 @@
 
 struct hub_config
 {
-	int   server_port;                     /*<<< Server port to bind to (default: 1511) */
-	char* server_bind_addr;                /*<<< Server bind address (default: any) */
-	int   server_listen_backlog;           /*<<< Server listen backlog (default: 50) */
-	char* server_alt_ports;                /*<<< Comma separated list of alternative ports to listen to (default: ) */
-	int   hub_enabled;                     /*<<< Is server enabled (default: 1) */
-	int   show_banner;                     /*<<< Show banner on connect (default: 1) */
-	int   show_banner_sys_info;            /*<<< Show banner on connect (default: 1) */
-	int   max_users;                       /*<<< Maximum number of users allowed on the hub (default: 500) */
-	int   registered_users_only;           /*<<< Allow registered users only (default: 0) */
-	int   obsolete_clients;                /*<<< Support obsolete clients using a ADC protocol prior to 1.0 (default: 0) */
-	int   chat_only;                       /*<<< Allow chat only operation on hub (default: 0) */
-	int   chat_is_privileged;              /*<<< Allow chat for operators and above only (default: 0) */
-	char* hub_name;                        /*<<< Name of hub (default: uhub) */
-	char* hub_description;                 /*<<< Short hub description, topic or subject. (default: no description) */
-	int   max_recv_buffer;                 /*<<< Max read buffer before parse, per user (default: 4096) */
-	int   max_send_buffer;                 /*<<< Max send buffer before disconnect, per user (default: 131072) */
-	int   max_send_buffer_soft;            /*<<< Max send buffer before message drops, per user (default: 98304) */
-	int   low_bandwidth_mode;              /*<<< Enable bandwidth saving measures (default: 0) */
-	int   max_chat_history;                /*<<< Number of chat messages kept in history (default: 20) */
-	int   max_logout_log;                  /*<<< Number of log entries for people leaving the hub (default: 20) */
-	int   limit_max_hubs_user;             /*<<< Max concurrent hubs as a guest user (default: 10) */
-	int   limit_max_hubs_reg;              /*<<< Max concurrent hubs as a registered user (default: 10) */
-	int   limit_max_hubs_op;               /*<<< Max concurrent hubs as a operator (or admin) (default: 10) */
-	int   limit_max_hubs;                  /*<<< Max total hub connections allowed, user/reg/op combined. (default: 25) */
-	int   limit_min_hubs_user;             /*<<< Minimum concurrent hubs as a guest user (default: 0) */
-	int   limit_min_hubs_reg;              /*<<< Minimum concurrent hubs as a registered user (default: 0) */
-	int   limit_min_hubs_op;               /*<<< Minimum concurrent hubs as a operator (or admin) (default: 0) */
-	int   limit_min_share;                 /*<<< Limit minimum share size in megabytes (default: 0) */
-	int   limit_max_share;                 /*<<< Limit maximum share size in megabytes (default: 0) */
-	int   limit_min_slots;                 /*<<< Limit minimum number of upload slots open per user (default: 0) */
-	int   limit_max_slots;                 /*<<< Limit minimum number of upload slots open per user (default: 0) */
-	int   flood_ctl_interval;              /*<<< Time interval in seconds for flood control check. (default: 0) */
-	int   flood_ctl_chat;                  /*<<< Max chat messages allowed in time interval (default: 0) */
-	int   flood_ctl_connect;               /*<<< Max connections requests allowed in time interval (default: 0) */
-	int   flood_ctl_search;                /*<<< Max search requests allowed in time interval (default: 0) */
-	int   flood_ctl_update;                /*<<< Max updates allowed in time interval (default: 0) */
-	int   flood_ctl_extras;                /*<<< Max extra messages allowed in time interval (default: 0) */
-	int   tls_enable;                      /*<<< Enable SSL/TLS support (default: 0) */
-	int   tls_require;                     /*<<< If SSL/TLS enabled, should it be required (default: 0) (default: 0) */
-	char* tls_certificate;                 /*<<< Certificate file (default: ) */
-	char* tls_private_key;                 /*<<< Private key file (default: ) */
-	char* file_motd;                       /*<<< File containing the 'message of the day (default: ) */
-	char* file_acl;                        /*<<< File containing access control lists (default: ) */
-	char* file_rules;                      /*<<< File containing hub rules (default: ) */
-	char* msg_hub_full;                    /*<<< "Hub is full" */
-	char* msg_hub_disabled;                /*<<< "Hub is disabled" */
-	char* msg_hub_registered_users_only;   /*<<< "Hub is for registered users only" */
-	char* msg_inf_error_nick_missing;      /*<<< "No nickname given" */
-	char* msg_inf_error_nick_multiple;     /*<<< "Multiple nicknames given" */
-	char* msg_inf_error_nick_invalid;      /*<<< "Nickname is invalid" */
-	char* msg_inf_error_nick_long;         /*<<< "Nickname too long" */
-	char* msg_inf_error_nick_short;        /*<<< "Nickname too short" */
-	char* msg_inf_error_nick_spaces;       /*<<< "Nickname cannot start with spaces" */
-	char* msg_inf_error_nick_bad_chars;    /*<<< "Nickname contains invalid characters" */
-	char* msg_inf_error_nick_not_utf8;     /*<<< "Nickname is not valid UTF-8" */
-	char* msg_inf_error_nick_taken;        /*<<< "Nickname is already in use" */
-	char* msg_inf_error_nick_restricted;   /*<<< "Nickname cannot be used on this hub" */
-	char* msg_inf_error_cid_invalid;       /*<<< "CID is not valid" */
-	char* msg_inf_error_cid_missing;       /*<<< "CID is not specified" */
-	char* msg_inf_error_cid_taken;         /*<<< "CID is taken" */
-	char* msg_inf_error_pid_missing;       /*<<< "PID is not specified" */
-	char* msg_inf_error_pid_invalid;       /*<<< "PID is invalid" */
-	char* msg_ban_permanently;             /*<<< "Banned permanently" */
-	char* msg_ban_temporarily;             /*<<< "Banned temporarily" */
-	char* msg_auth_invalid_password;       /*<<< "Password is wrong" */
-	char* msg_auth_user_not_found;         /*<<< "User not found in password database" */
-	char* msg_error_no_memory;             /*<<< "No memory" */
-	char* msg_user_share_size_low;         /*<<< "User is not sharing enough" */
-	char* msg_user_share_size_high;        /*<<< "User is sharing too much" */
-	char* msg_user_slots_low;              /*<<< "User have too few upload slots." */
-	char* msg_user_slots_high;             /*<<< "User have too many upload slots." */
-	char* msg_user_hub_limit_low;          /*<<< "User is on too few hubs." */
-	char* msg_user_hub_limit_high;         /*<<< "User is on too many hubs." */
-	char* msg_user_flood_chat;             /*<<< "Chat flood detected, messages are dropped." */
-	char* msg_user_flood_connect;          /*<<< "Connect flood detected, connection refused." */
-	char* msg_user_flood_search;           /*<<< "Search flood detected, search is stopped." */
-	char* msg_user_flood_update;           /*<<< "Update flood detected." */
-	char* msg_user_flood_extras;           /*<<< "Flood detected." */
-	char* msg_proto_no_common_hash;        /*<<< "No common hash algorithm." */
-	char* msg_proto_obsolete_adc0;         /*<<< "Client is using an obsolete ADC protocol version." */
-};
-