LIST: allow channel display threshold to be configured (closes #109)

[solanum.git] / src / newconf.c

diff --git a/src/newconf.c b/src/newconf.c
index cf675727678165cf1c46f76f6bbdb264b69df9b1..717cfcf44d9e83f421538af5c921230bbcedc228 100644 (file)
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -1826,7 +1826,7 @@ conf_set_channel_autochanmodes(void *data)
                        }
                        else
                        {
-                               conf_report_error("channel::autochanmodes -- Invalid channel mode %c", pm);
+                               conf_report_error("channel::autochanmodes -- Invalid channel mode %c", *pm);
                                continue;
                        }
                        break;
@@ -2252,6 +2252,7 @@ static struct ConfEntry conf_serverinfo_table[] =
        { "ssl_ca_cert",        CF_QSTRING, NULL, 0, &ServerInfo.ssl_ca_cert },
        { "ssl_cert",           CF_QSTRING, NULL, 0, &ServerInfo.ssl_cert },
        { "ssl_dh_params",      CF_QSTRING, NULL, 0, &ServerInfo.ssl_dh_params },
+       { "ssl_cipher_list",    CF_QSTRING, NULL, 0, &ServerInfo.ssl_cipher_list },
        { "ssld_count",         CF_INT,     NULL, 0, &ServerInfo.ssld_count },
 
        { "default_max_clients",CF_INT,     NULL, 0, &ServerInfo.default_max_clients },
@@ -2457,6 +2458,7 @@ static struct ConfEntry conf_channel_table[] =
        { "channel_target_change", CF_YESNO, NULL, 0, &ConfigChannel.channel_target_change      },
        { "disable_local_channels", CF_YESNO, NULL, 0, &ConfigChannel.disable_local_channels },
        { "autochanmodes",      CF_QSTRING, conf_set_channel_autochanmodes, 0, NULL     },
+       { "displayed_usercount",        CF_INT, NULL, 0, &ConfigChannel.displayed_usercount     },
        { "\0",                 0,        NULL, 0, NULL }
 };