X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/d7cff1d11ba8b6a5eb393911b8edda125b2f9bbb..92504d43b11e73128080abf665e630a916a12b15:/include/s_conf.h

diff --git a/include/s_conf.h b/include/s_conf.h
index bb2e162..70c755c 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,10 +133,6 @@ 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;
 
@@ -237,6 +235,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
@@ -250,7 +250,7 @@ struct config_server_hide
 struct server_info
 {
 	char *name;
-	char sid[3];
+	char sid[4];
 	char *description;
 	char *network_name;
 	char *network_desc;
@@ -333,23 +333,11 @@ extern void yyerror(const char *);
 extern int conf_yy_fatal_error(const char *);
 extern int conf_fgets(char *, int, FILE *);
 
-typedef enum
-{
-	CONF_TYPE,
-	KLINE_TYPE,
-	DLINE_TYPE,
-	RESV_TYPE
-}
-KlineType;
-
-extern void write_confitem(KlineType, struct Client *, char *, char *,
-			   const char *, const char *, const char *, int);
 extern void add_temp_kline(struct ConfItem *);
 extern void add_temp_dline(struct ConfItem *);
 extern void report_temp_klines(struct Client *);
 extern void show_temp_klines(struct Client *, rb_dlink_list *);
 
-extern const char *get_conf_name(KlineType);
 extern int rehash(int);
 extern void rehash_bans(int);
 
@@ -360,14 +348,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 *get_oper_name(struct Client *client_p);
 
 extern int yylex(void);