ircd: fix up some iwarn() calls which referred to L_MAIN

[solanum.git] / include / s_conf.h

diff --git a/include/s_conf.h b/include/s_conf.h
index ec6545c4527512ff9161e0c2aa3bbd71aaee56dd..0bcd76c3b964550321539d7facd555ae085e9d9c 100644 (file)
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -20,8 +20,6 @@
  *  along with this program; if not, write to the Free Software
  *  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
@@ -110,6 +108,7 @@ struct ConfItem
 #define CONF_FLAGS_EXEMPTSHIDE         0x00010000
 #define CONF_FLAGS_EXEMPTJUPE          0x00020000      /* exempt from resv generating warnings */
 #define CONF_FLAGS_NEED_SASL           0x00040000
+#define CONF_FLAGS_EXTEND_CHANS                0x00080000
 #define CONF_FLAGS_ENCRYPTED            0x00200000
 #define CONF_FLAGS_EXEMPTDNSBL         0x04000000
 
@@ -132,6 +131,7 @@ struct ConfItem
 #define IsConfEncrypted(x)      ((x)->flags & CONF_FLAGS_ENCRYPTED)
 #define IsNeedSasl(x)          ((x)->flags & CONF_FLAGS_NEED_SASL)
 #define IsConfExemptDNSBL(x)   ((x)->flags & CONF_FLAGS_EXEMPTDNSBL)
+#define IsConfExtendChans(x)   ((x)->flags & CONF_FLAGS_EXTEND_CHANS)
 #define IsConfSSLNeeded(x)     ((x)->flags & CONF_FLAGS_NEED_SSL)
 
 /* flag definitions for opers now in client.h */
@@ -235,6 +235,8 @@ struct config_file_entry
 
        unsigned int nicklen;
        int certfp_method;
+
+       int hide_opers_in_whois;
 };
 
 struct config_channel_entry
@@ -248,6 +250,7 @@ struct config_channel_entry
        int max_bans;
        int max_bans_large;
        int max_chans_per_user;
+       int max_chans_per_user_large;
        int no_create_on_split;
        int no_join_on_split;
        int default_split_server_count;
@@ -258,6 +261,9 @@ struct config_channel_entry
        int resv_forcepart;
        int channel_target_change;
        int disable_local_channels;
+       unsigned int autochanmodes;
+       int displayed_usercount;
+       int strip_topic_colors;
 };
 
 struct config_server_hide
@@ -288,6 +294,7 @@ struct server_info
        char *ssl_ca_cert;
        char *ssl_cert;
        char *ssl_dh_params;
+       char *ssl_cipher_list;
        int ssld_count;
 };