X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/918a0e1d39ded82e52f8ac3303ace326c207fe4c..07b7b659c16665ce33b058d1a06a7a420850ceb9:/include/s_conf.h

diff --git a/include/s_conf.h b/include/s_conf.h
index fbd583a..84d47bd 100644
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -64,6 +64,8 @@ struct ConfItem
 	char *host;		/* host part of user@host */
 	char *passwd;		/* doubles as kline reason *ugh* */
 	char *spasswd;		/* Password to send. */
+	char *autojoin;		/* channels for users to autojoin to on connect */
+	char *autojoin_opers; /* channels for opers to autojoin on oper-up */
 	char *user;		/* user part of user@host */
 	int port;
 	time_t hold;		/* Hold action until this time (calendar time) */
@@ -131,15 +133,12 @@ struct config_file_entry
 {
 	const char *dpath;	/* DPATH if set from command line */
 	const char *configfile;
-	const char *klinefile;
-	const char *dlinefile;
-	const char *xlinefile;
-	const char *resvfile;
 
 	char *egdpool_path;
 
 	char *default_operstring;
 	char *default_adminstring;
+	char *default_operhost;
 	char *servicestring;
 	char *kline_reason;
 
@@ -218,14 +217,21 @@ struct config_file_entry
 	int default_umodes;
 	int global_snotices;
 	int operspy_dont_care_user_info;
+	int secret_channels_in_whois;
+	int expire_override_time;
 };
 
 struct config_channel_entry
 {
+	char * autochanmodes;
+	char * exemptchanops;
+	int use_halfop;
+	int use_owner;
 	int use_except;
 	int use_invex;
 	int use_knock;
 	int use_forward;
+	int use_local_channels;
 	int knock_delay;
 	int knock_delay_channel;
 	int max_bans;
@@ -238,7 +244,18 @@ struct config_channel_entry
 	int burst_topicwho;
 	int kick_on_split_riding;
 	int only_ascii_channels;
+	int cycle_host_change;
+	int host_in_topic;
 	int resv_forcepart;
+	int kick_no_rejoin_time;
+
+	int exempt_cmode_c;
+	int exempt_cmode_C;
+	int exempt_cmode_D;
+	int exempt_cmode_T;
+	int exempt_cmode_N;
+	int exempt_cmode_G;
+	int exempt_cmode_K;
 };
 
 struct config_server_hide
@@ -350,15 +367,6 @@ extern void conf_add_class(struct ConfItem *, int);
 extern void conf_add_d_conf(struct ConfItem *);
 extern void flush_expired_ips(void *);
 
-
-/* XXX consider moving these into kdparse.h */
-extern void parse_k_file(FILE * fb);
-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);
 
 extern int yylex(void);