From c9b5cd623b56645b3a998fbaa201214f3118c187 Mon Sep 17 00:00:00 2001 From: Aaron Jones Date: Sun, 13 Jul 2014 00:00:00 +0000 Subject: [PATCH] Remove network_desc configuration option, never actually used anywhere --- doc/ircd.conf.example | 1 - doc/reference.conf | 1 - doc/sgml/oper-guide/config.sgml | 10 ---------- include/defaults.h | 1 - include/s_conf.h | 1 - modules/m_info.c | 6 ------ src/newconf.c | 1 - src/s_conf.c | 6 ------ testsuite/ircd.conf.1 | 1 - testsuite/ircd.conf.2 | 1 - testsuite/ircd.conf.3 | 1 - 11 files changed, 30 deletions(-) diff --git a/doc/ircd.conf.example b/doc/ircd.conf.example index 3ef9deb4..90ca6ac0 100755 --- a/doc/ircd.conf.example +++ b/doc/ircd.conf.example @@ -48,7 +48,6 @@ serverinfo { sid = "42X"; description = "charybdis test server"; network_name = "StaticBox"; - network_desc = "Your IRC network."; hub = yes; /* On multi-homed hosts you may need the following. These define diff --git a/doc/reference.conf b/doc/reference.conf index 62c68d64..78d107ab 100755 --- a/doc/reference.conf +++ b/doc/reference.conf @@ -122,7 +122,6 @@ serverinfo { * is on. Shown in the 005 reply and used with serverhiding. */ network_name = "MyNet"; - network_desc = "This is My Network"; /* hub: allow this server to act as a hub and have multiple servers * connected to it. diff --git a/doc/sgml/oper-guide/config.sgml b/doc/sgml/oper-guide/config.sgml index 91b868bc..0d585124 100644 --- a/doc/sgml/oper-guide/config.sgml +++ b/doc/sgml/oper-guide/config.sgml @@ -45,7 +45,6 @@ serverinfo { sid = "text"; description = "text"; network_name = "text"; - network_desc = "text"; hub = boolean; vhost = "text"; vhost6 = "text"; @@ -94,15 +93,6 @@ serverinfo { - - network_desc - - - A description of the IRC network that this server will be a member of. - This is currently unused. - - - hub diff --git a/include/defaults.h b/include/defaults.h index 0ec6912e..839a6c32 100644 --- a/include/defaults.h +++ b/include/defaults.h @@ -48,7 +48,6 @@ #define TS_WARN_DELTA_DEFAULT 30 /* default for ts_warn_delta */ /* ServerInfo default values */ #define NETWORK_NAME_DEFAULT "EFnet" /* default for network_name */ -#define NETWORK_DESC_DEFAULT "Eris Free Network" /* default for network_desc */ /* General defaults */ #define CLIENT_FLOOD_DEFAULT 20 /* default for client_flood */ #define CLIENT_FLOOD_MAX 2000 diff --git a/include/s_conf.h b/include/s_conf.h index 164e646f..3f4d69f5 100644 --- a/include/s_conf.h +++ b/include/s_conf.h @@ -273,7 +273,6 @@ struct server_info char sid[4]; char *description; char *network_name; - char *network_desc; int hub; struct sockaddr_in ip; int default_max_clients; diff --git a/modules/m_info.c b/modules/m_info.c index 85b6d44c..3e6df088 100644 --- a/modules/m_info.c +++ b/modules/m_info.c @@ -356,12 +356,6 @@ static struct InfoStruct info_table[] = { &ServerInfo.network_name, "Network name" }, - { - "network_desc", - OUTPUT_STRING, - &ServerInfo.network_desc, - "Network description" - }, { "nick_delay", OUTPUT_DECIMAL, diff --git a/src/newconf.c b/src/newconf.c index 22aa81c7..35aa2342 100644 --- a/src/newconf.c +++ b/src/newconf.c @@ -2185,7 +2185,6 @@ remove_conf_item(const char *topconf, const char *name) static struct ConfEntry conf_serverinfo_table[] = { { "description", CF_QSTRING, NULL, 0, &ServerInfo.description }, - { "network_desc", CF_QSTRING, NULL, 0, &ServerInfo.network_desc }, { "hub", CF_YESNO, NULL, 0, &ServerInfo.hub }, { "network_name", CF_QSTRING, conf_set_serverinfo_network_name, 0, NULL }, diff --git a/src/s_conf.c b/src/s_conf.c index 0f54d542..a4318f1b 100644 --- a/src/s_conf.c +++ b/src/s_conf.c @@ -674,7 +674,6 @@ set_default_conf(void) /* ServerInfo.name = ServerInfo.name; */ ServerInfo.description = NULL; ServerInfo.network_name = NULL; - ServerInfo.network_desc = NULL; memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip)); ServerInfo.specific_ipv4_vhost = 0; @@ -852,9 +851,6 @@ validate_conf(void) if(ServerInfo.network_name == NULL) ServerInfo.network_name = rb_strdup(NETWORK_NAME_DEFAULT); - if(ServerInfo.network_desc == NULL) - ServerInfo.network_desc = rb_strdup(NETWORK_DESC_DEFAULT); - if(ServerInfo.ssld_count < 1) ServerInfo.ssld_count = 1; @@ -1461,8 +1457,6 @@ clear_out_old_conf(void) ServerInfo.description = NULL; rb_free(ServerInfo.network_name); ServerInfo.network_name = NULL; - rb_free(ServerInfo.network_desc); - ServerInfo.network_desc = NULL; ServerInfo.ssld_count = 1; diff --git a/testsuite/ircd.conf.1 b/testsuite/ircd.conf.1 index a91ecd1e..2479bcda 100644 --- a/testsuite/ircd.conf.1 +++ b/testsuite/ircd.conf.1 @@ -13,7 +13,6 @@ serverinfo { sid = "1TT"; description = "Testsuite"; network_name = "Testsuite"; - network_desc = "Testing"; hub = yes; vhost = "127.0.0.1"; }; diff --git a/testsuite/ircd.conf.2 b/testsuite/ircd.conf.2 index 184f0524..8cdc977c 100644 --- a/testsuite/ircd.conf.2 +++ b/testsuite/ircd.conf.2 @@ -13,7 +13,6 @@ serverinfo { sid = "2TT"; description = "Testsuite"; network_name = "Testsuite"; - network_desc = "Testing"; hub = yes; vhost = "127.0.0.1"; }; diff --git a/testsuite/ircd.conf.3 b/testsuite/ircd.conf.3 index cb8f379c..362d658f 100644 --- a/testsuite/ircd.conf.3 +++ b/testsuite/ircd.conf.3 @@ -13,7 +13,6 @@ serverinfo { sid = "3TT"; description = "Testsuite"; network_name = "Testsuite"; - network_desc = "Testing"; hub = yes; vhost = "127.0.0.1"; };