Automated merge with ssh://shadowircd/uranium/shadowircd/

[irc/rqf/shadowircd.git] / include / s_conf.h

diff --git a/include/s_conf.h b/include/s_conf.h
index 31b9a74feaf12f2ac31ca0de3bcd44b135490e88..ebe88f1fe02a559f82ce8fe848712bff763ed061 100644 (file)
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -21,7 +21,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_conf.h 3550 2007-08-09 06:47:26Z nenolod $
  */
 
 #ifndef INCLUDED_s_conf_h
@@ -212,6 +211,7 @@ struct config_file_entry
        int min_nonwildcard_simple;
        int default_floodcount;
        int client_flood;
+       int default_ident_timeout;
        int use_egd;
        int ping_cookie;
        int tkline_expire_notices;
@@ -243,7 +243,6 @@ struct config_channel_entry
        int use_except;
        int use_invex;
        int use_knock;
-       int use_forward;
        int use_local_channels;
        int knock_delay;
        int knock_delay_channel;
@@ -260,7 +259,6 @@ struct config_channel_entry
        int cycle_host_change;
        int host_in_topic;
        int resv_forcepart;
-       int kick_no_rejoin_time;
 
        int exempt_cmode_c;
        int exempt_cmode_C;
@@ -286,6 +284,8 @@ struct server_info
        char *description;
        char *network_name;
        char *network_desc;
+       char *helpchan;
+       char *helpurl;
        int hub;
        struct sockaddr_in ip;
        int default_max_clients;