9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove network_desc configuration option, never actually used anywhere

Browse source
This commit is contained in:
Aaron Jones 2014-07-13 00:00:00 +00:00 committed by William Pitcock
parent c7e38ca917
commit c9b5cd623b
11 changed files with 0 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/ircd.conf.example
View file

@ -48,7 +48,6 @@ serverinfo {
sid = "42X"; sid = "42X";
description = "charybdis test server"; description = "charybdis test server";
network_name = "StaticBox"; network_name = "StaticBox";
network_desc = "Your IRC network.";
hub = yes; hub = yes;
/* On multi-homed hosts you may need the following. These define /* On multi-homed hosts you may need the following. These define

1
doc/reference.conf
View file

@ -122,7 +122,6 @@ serverinfo {
* is on. Shown in the 005 reply and used with serverhiding. * is on. Shown in the 005 reply and used with serverhiding.
*/ */
network_name = "MyNet"; network_name = "MyNet";
network_desc = "This is My Network";
/* hub: allow this server to act as a hub and have multiple servers /* hub: allow this server to act as a hub and have multiple servers
* connected to it. * connected to it.

10
doc/sgml/oper-guide/config.sgml
View file

@ -45,7 +45,6 @@ serverinfo {
sid = "<replaceable>text</replaceable>"; sid = "<replaceable>text</replaceable>";
description = "<replaceable>text</replaceable>"; description = "<replaceable>text</replaceable>";
network_name = "<replaceable>text</replaceable>"; network_name = "<replaceable>text</replaceable>";
network_desc = "<replaceable>text</replaceable>";
hub = <replaceable>boolean</replaceable>; hub = <replaceable>boolean</replaceable>;
vhost = "<replaceable>text</replaceable>"; vhost = "<replaceable>text</replaceable>";
vhost6 = "<replaceable>text</replaceable>"; vhost6 = "<replaceable>text</replaceable>";
@ -94,15 +93,6 @@ serverinfo {
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term>network_desc</term>
<listitem>
<para>
A description of the IRC network that this server will be a member of.
This is currently unused.
</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term>hub</term> <term>hub</term>
<listitem> <listitem>

1
include/defaults.h
View file

@ -48,7 +48,6 @@
#define TS_WARN_DELTA_DEFAULT 30 /* default for ts_warn_delta */ #define TS_WARN_DELTA_DEFAULT 30 /* default for ts_warn_delta */
/* ServerInfo default values */ /* ServerInfo default values */
#define NETWORK_NAME_DEFAULT "EFnet" /* default for network_name */ #define NETWORK_NAME_DEFAULT "EFnet" /* default for network_name */
#define NETWORK_DESC_DEFAULT "Eris Free Network" /* default for network_desc */
/* General defaults */ /* General defaults */
#define CLIENT_FLOOD_DEFAULT 20 /* default for client_flood */ #define CLIENT_FLOOD_DEFAULT 20 /* default for client_flood */
#define CLIENT_FLOOD_MAX 2000 #define CLIENT_FLOOD_MAX 2000

1
include/s_conf.h
View file

@ -273,7 +273,6 @@ struct server_info
char sid[4]; char sid[4];
char *description; char *description;
char *network_name; char *network_name;
char *network_desc;
int hub; int hub;
struct sockaddr_in ip; struct sockaddr_in ip;
int default_max_clients; int default_max_clients;

6
modules/m_info.c
View file

@ -356,12 +356,6 @@ static struct InfoStruct info_table[] = {
&ServerInfo.network_name, &ServerInfo.network_name,
"Network name" "Network name"
}, },
{
"network_desc",
OUTPUT_STRING,
&ServerInfo.network_desc,
"Network description"
},
{ {
"nick_delay", "nick_delay",
OUTPUT_DECIMAL, OUTPUT_DECIMAL,

1
src/newconf.c
View file

@ -2185,7 +2185,6 @@ remove_conf_item(const char *topconf, const char *name)
static struct ConfEntry conf_serverinfo_table[] = static struct ConfEntry conf_serverinfo_table[] =
{ {
{ "description", CF_QSTRING, NULL, 0, &ServerInfo.description }, { "description", CF_QSTRING, NULL, 0, &ServerInfo.description },
{ "network_desc", CF_QSTRING, NULL, 0, &ServerInfo.network_desc },
{ "hub", CF_YESNO, NULL, 0, &ServerInfo.hub }, { "hub", CF_YESNO, NULL, 0, &ServerInfo.hub },
{ "network_name", CF_QSTRING, conf_set_serverinfo_network_name, 0, NULL }, { "network_name", CF_QSTRING, conf_set_serverinfo_network_name, 0, NULL },

6
src/s_conf.c
View file

@ -674,7 +674,6 @@ set_default_conf(void)
/* ServerInfo.name = ServerInfo.name; */ /* ServerInfo.name = ServerInfo.name; */
ServerInfo.description = NULL; ServerInfo.description = NULL;
ServerInfo.network_name = NULL; ServerInfo.network_name = NULL;
ServerInfo.network_desc = NULL;
memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip)); memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
ServerInfo.specific_ipv4_vhost = 0; ServerInfo.specific_ipv4_vhost = 0;
@ -852,9 +851,6 @@ validate_conf(void)
if(ServerInfo.network_name == NULL) if(ServerInfo.network_name == NULL)
ServerInfo.network_name = rb_strdup(NETWORK_NAME_DEFAULT); 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) if(ServerInfo.ssld_count < 1)
ServerInfo.ssld_count = 1; ServerInfo.ssld_count = 1;
@ -1461,8 +1457,6 @@ clear_out_old_conf(void)
ServerInfo.description = NULL; ServerInfo.description = NULL;
rb_free(ServerInfo.network_name); rb_free(ServerInfo.network_name);
ServerInfo.network_name = NULL; ServerInfo.network_name = NULL;
rb_free(ServerInfo.network_desc);
ServerInfo.network_desc = NULL;
ServerInfo.ssld_count = 1; ServerInfo.ssld_count = 1;

1
testsuite/ircd.conf.1
View file

@ -13,7 +13,6 @@ serverinfo {
sid = "1TT"; sid = "1TT";
description = "Testsuite"; description = "Testsuite";
network_name = "Testsuite"; network_name = "Testsuite";
network_desc = "Testing";
hub = yes; hub = yes;
vhost = "127.0.0.1"; vhost = "127.0.0.1";
}; };

1
testsuite/ircd.conf.2
View file

@ -13,7 +13,6 @@ serverinfo {
sid = "2TT"; sid = "2TT";
description = "Testsuite"; description = "Testsuite";
network_name = "Testsuite"; network_name = "Testsuite";
network_desc = "Testing";
hub = yes; hub = yes;
vhost = "127.0.0.1"; vhost = "127.0.0.1";
}; };

1
testsuite/ircd.conf.3
View file

@ -13,7 +13,6 @@ serverinfo {
sid = "3TT"; sid = "3TT";
description = "Testsuite"; description = "Testsuite";
network_name = "Testsuite"; network_name = "Testsuite";
network_desc = "Testing";
hub = yes; hub = yes;
vhost = "127.0.0.1"; vhost = "127.0.0.1";
}; };