X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/12894c8888675e4627d0e16b850e73648b5f3dce..6898ce9dde52783a358e426da1bda298cfa218a3:/include/s_conf.h

diff --git a/include/s_conf.h b/include/s_conf.h
index 762dac1..ec3a222 100644
--- 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
@@ -97,6 +96,7 @@ struct ConfItem
 /* Generic flags... */
 #define CONF_FLAGS_TEMPORARY            0x00800000
 #define CONF_FLAGS_NEED_SSL		0x00000002
+#define CONF_FLAGS_MYOPER		0x00080000 /* need to rewrite info.oper on burst */
 /* auth{} flags... */
 #define CONF_FLAGS_NO_TILDE             0x00000004
 #define CONF_FLAGS_NEED_IDENTD          0x00000008
@@ -166,6 +166,7 @@ struct config_file_entry
 
 	unsigned char compression_level;
 	int disable_fake_channels;
+	int hide_channel_below_users;
 	int dots_in_ident;
 	int failed_oper_notice;
 	int anti_nick_flood;
@@ -211,6 +212,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;
@@ -228,6 +230,7 @@ struct config_file_entry
 	int default_umodes;
 	int global_snotices;
 	int operspy_dont_care_user_info;
+	int use_propagated_bans;
 	int secret_channels_in_whois;
 	int expire_override_time;
 };
@@ -241,7 +244,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;
@@ -258,7 +260,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;
@@ -284,6 +285,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;
@@ -347,7 +350,9 @@ extern void init_s_conf(void);
 extern struct ConfItem *make_conf(void);
 extern void free_conf(struct ConfItem *);
 
+extern rb_dlink_node *find_prop_ban(unsigned int status, const char *user, const char *host);
 extern void deactivate_conf(struct ConfItem *, rb_dlink_node *);
+extern void replace_old_ban(struct ConfItem *);
 
 extern void read_conf_files(int cold);
 
@@ -368,6 +373,7 @@ extern void yyerror(const char *);
 extern int conf_yy_fatal_error(const char *);
 extern int conf_fgets(char *, int, FILE *);
 
+extern int valid_wild_card(const char *, const char *);
 extern void add_temp_kline(struct ConfItem *);
 extern void add_temp_dline(struct ConfItem *);
 extern void report_temp_klines(struct Client *);