Get rid of User.server.

[irc/rqf/shadowircd.git] / src / newconf.c

diff --git a/src/newconf.c b/src/newconf.c
index 7e2a3766ec99e7fd85a556104098b0b0cdfd8bcf..8c1e52b565ca79950b434f79e2d75807c3c744d6 100644 (file)
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -1,5 +1,5 @@
 /* This code is in the public domain.
- * $Id: newconf.c 3131 2007-01-21 15:36:31Z jilles $
+ * $Id: newconf.c 3550 2007-08-09 06:47:26Z nenolod $
  */
 
 #include "stdinc.h"
@@ -1910,7 +1910,6 @@ 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            },
-       { "use_ts6",            CF_YESNO,   NULL, 0, &ServerInfo.use_ts6        },
 
        { "network_name",       CF_QSTRING, conf_set_serverinfo_network_name,   0, NULL },
        { "name",               CF_QSTRING, conf_set_serverinfo_name,   0, NULL },
@@ -1918,6 +1917,8 @@ static struct ConfEntry conf_serverinfo_table[] =
        { "vhost",              CF_QSTRING, conf_set_serverinfo_vhost,  0, NULL },
        { "vhost6",             CF_QSTRING, conf_set_serverinfo_vhost6, 0, NULL },
 
+       { "max_clients",        CF_INT,     NULL, 0, &ServerInfo.max_clients    },
+
        { "\0", 0, NULL, 0, NULL }
 };
 
@@ -2051,6 +2052,7 @@ static struct ConfEntry conf_general_table[] =
        { "max_nick_time",      CF_TIME,  NULL, 0, &ConfigFileEntry.max_nick_time       },
        { "max_nick_changes",   CF_INT,   NULL, 0, &ConfigFileEntry.max_nick_changes    },
        { "max_targets",        CF_INT,   NULL, 0, &ConfigFileEntry.max_targets         },
+       { "max_unknown_ip",     CF_INT,   NULL, 0, &ConfigFileEntry.max_unknown_ip      },
        { "min_nonwildcard",    CF_INT,   NULL, 0, &ConfigFileEntry.min_nonwildcard     },
        { "nick_delay",         CF_TIME,  NULL, 0, &ConfigFileEntry.nick_delay          },
        { "no_oper_flood",      CF_YESNO, NULL, 0, &ConfigFileEntry.no_oper_flood       },
@@ -2083,7 +2085,6 @@ static struct ConfEntry conf_channel_table[] =
        { "default_split_user_count",   CF_INT,  NULL, 0, &ConfigChannel.default_split_user_count        },
        { "default_split_server_count", CF_INT,  NULL, 0, &ConfigChannel.default_split_server_count },
        { "burst_topicwho",     CF_YESNO, NULL, 0, &ConfigChannel.burst_topicwho        },
-       { "invite_ops_only",    CF_YESNO, NULL, 0, &ConfigChannel.invite_ops_only       },
        { "kick_on_split_riding", CF_YESNO, NULL, 0, &ConfigChannel.kick_on_split_riding },
        { "knock_delay",        CF_TIME,  NULL, 0, &ConfigChannel.knock_delay           },
        { "knock_delay_channel",CF_TIME,  NULL, 0, &ConfigChannel.knock_delay_channel   },