Add .travis.yml

[solanum.git] / ircd / newconf.c

diff --git a/ircd/newconf.c b/ircd/newconf.c
index f6cbd44b604147b79b9cc9fffdb3bbf81087d860..32ba83e3279a31d90d458b219f4a76d602c990ae 100644 (file)
--- a/ircd/newconf.c
+++ b/ircd/newconf.c
@@ -390,6 +390,8 @@ static struct mode_table shared_table[] =
        { "locops",     SHARED_LOCOPS   },
        { "rehash",     SHARED_REHASH   },
        { "grant",      SHARED_GRANT    },
+       { "die",        SHARED_DIE      },
+       { "module",     SHARED_MODULE   },
        { "all",        SHARED_ALL      },
        { "none",       0               },
        {NULL, 0}
@@ -860,6 +862,11 @@ conf_set_listen_port_both(void *data, int ssl)
                }
                 if(listener_address == NULL)
                 {
+                       if (!ssl)
+                       {
+                               conf_report_error("listener 'ANY/%d': support for plaintext listeners is being deprecated and may be removed in a future release.  "
+                                                  "It is suggested that users be migrated to SSL/TLS connections.", args->v.number);
+                       }
                        add_listener(args->v.number, listener_address, AF_INET, ssl, ssl || yy_defer_accept);
 #ifdef RB_IPV6
                        add_listener(args->v.number, listener_address, AF_INET6, ssl, ssl || yy_defer_accept);
@@ -875,8 +882,13 @@ conf_set_listen_port_both(void *data, int ssl)
 #endif
                                family = AF_INET;
 
-                       add_listener(args->v.number, listener_address, family, ssl, ssl || yy_defer_accept);
+                       if (!ssl)
+                       {
+                               conf_report_error("listener '%s/%d': support for plaintext listeners is being deprecated and may be removed in a future release.  "
+                                                  "It is suggested that users be migrated to SSL/TLS connections.", listener_address, args->v.number);
+                       }
 
+                       add_listener(args->v.number, listener_address, family, ssl, ssl || yy_defer_accept);
                 }
 
        }
@@ -2426,6 +2438,7 @@ static struct ConfEntry conf_general_table[] =
        { "client_flood_message_time",  CF_INT,   NULL, 0, &ConfigFileEntry.client_flood_message_time   },
        { "max_ratelimit_tokens",       CF_INT,   NULL, 0, &ConfigFileEntry.max_ratelimit_tokens        },
        { "away_interval",              CF_INT,   NULL, 0, &ConfigFileEntry.away_interval               },
+       { "hide_opers_in_whois",        CF_YESNO, NULL, 0, &ConfigFileEntry.hide_opers_in_whois         },
        { "certfp_method",      CF_STRING, conf_set_general_certfp_method, 0, NULL },
        { "\0",                 0,        NULL, 0, NULL }
 };
@@ -2454,6 +2467,7 @@ static struct ConfEntry conf_channel_table[] =
        { "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     },
+       { "strip_topic_colors", CF_YESNO, NULL, 0, &ConfigChannel.strip_topic_colors    },
        { "\0",                 0,        NULL, 0, NULL }
 };