Force part local users (not resv_exempt) on channel resv.

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

diff --git a/include/s_conf.h b/include/s_conf.h
index 5e6834f34027c52c84b6d0b46c66aa0c03daa2ef..750bfbd357f2f1c1022fa8d8d37cab0610ad55dc 100644 (file)
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -89,6 +89,7 @@ struct ConfItem
 
 /* Generic flags... */
 #define CONF_FLAGS_TEMPORARY            0x00800000
+#define CONF_FLAGS_NEED_SSL            0x00000002
 /* auth{} flags... */
 #define CONF_FLAGS_NO_TILDE             0x00000004
 #define CONF_FLAGS_NEED_IDENTD          0x00000008
@@ -122,6 +123,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 IsConfSSLNeeded(x)     ((x)->flags & CONF_FLAGS_NEED_SSL)
 
 /* flag definitions for opers now in client.h */
 
@@ -134,7 +136,6 @@ struct config_file_entry
        const char *xlinefile;
        const char *resvfile;
 
-       char *servlink_path;
        char *egdpool_path;
 
        char *default_operstring;
@@ -236,6 +237,8 @@ struct config_channel_entry
        int default_split_user_count;
        int burst_topicwho;
        int kick_on_split_riding;
+       int only_ascii_channels;
+       int resv_forcepart;
 };
 
 struct config_server_hide
@@ -249,7 +252,7 @@ struct config_server_hide
 struct server_info
 {
        char *name;
-       char sid[3];
+       char sid[4];
        char *description;
        char *network_name;
        char *network_desc;
@@ -366,6 +369,7 @@ extern void parse_d_file(FILE * fb);
 extern void parse_x_file(FILE * fb);
 extern void parse_resv_file(FILE *);
 extern char *getfield(char *newline);
+extern char *xline_encode_spaces(const char *);
 
 extern char *get_oper_name(struct Client *client_p);