X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/330692a1f28d6b722350550c4901fcbc38a87b08..13d8f0edbafbbbdbdd499629cf2f38896b124309:/include/s_conf.h

diff --git a/include/s_conf.h b/include/s_conf.h
index 2587a42b..ec6545c4 100644
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -141,8 +141,6 @@ struct config_file_entry
 	const char *dpath;	/* DPATH if set from command line */
 	const char *configfile;
 
-	char *egdpool_path;
-
 	char *default_operstring;
 	char *default_adminstring;
 	char *servicestring;
@@ -150,7 +148,9 @@ struct config_file_entry
 
 	char *identifyservice;
 	char *identifycommand;
-	
+
+	char *sasl_service;
+
 	char *fname_userlog;
 	char *fname_fuserlog;
 	char *fname_operlog;
@@ -206,7 +206,6 @@ struct config_file_entry
 	int min_nonwildcard_simple;
 	int default_floodcount;
 	int default_ident_timeout;
-	int use_egd;
 	int ping_cookie;
 	int tkline_expire_notices;
 	int use_whois_actually;
@@ -235,6 +234,7 @@ struct config_file_entry
 	int client_flood_message_num;
 
 	unsigned int nicklen;
+	int certfp_method;
 };
 
 struct config_channel_entry
@@ -274,7 +274,6 @@ struct server_info
 	char sid[4];
 	char *description;
 	char *network_name;
-	char *network_desc;
 	int hub;
 	struct sockaddr_in ip;
 	int default_max_clients;
@@ -339,7 +338,7 @@ 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 deactivate_conf(struct ConfItem *, rb_dlink_node *, time_t);
 extern void replace_old_ban(struct ConfItem *);
 
 extern void read_conf_files(int cold);
@@ -352,7 +351,7 @@ extern int detach_conf(struct Client *);
 extern struct ConfItem *find_tkline(const char *, const char *, struct sockaddr *);
 extern char *show_iline_prefix(struct Client *, struct ConfItem *, char *);
 extern void get_printable_conf(struct ConfItem *,
-			       char **, char **, char **, char **, int *, char **);
+			       char **, char **, const char **, char **, int *, char **);
 extern char *get_user_ban_reason(struct ConfItem *aconf);
 extern void get_printable_kline(struct Client *, struct ConfItem *,
 				char **, char **, char **, char **);