allow certfp method to be configured

[solanum.git] / include / s_conf.h

diff --git a/include/s_conf.h b/include/s_conf.h
index 7c732e073795faa796b3ce06ec6e1dcd9904266e..ec6545c4527512ff9161e0c2aa3bbd71aaee56dd 100644 (file)
--- 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;
@@ -220,10 +219,13 @@ struct config_file_entry
        int throttle_duration;
        int target_change;
        int collision_fnc;
+       int resv_fnc;
        int default_umodes;
        int global_snotices;
        int operspy_dont_care_user_info;
        int use_propagated_bans;
+       int max_ratelimit_tokens;
+       int away_interval;
 
        int client_flood_max_lines;
        int client_flood_burst_rate;
@@ -231,12 +233,15 @@ struct config_file_entry
        int client_flood_message_time;
        int client_flood_message_num;
 
+       unsigned int nicklen;
+       int certfp_method;
 };
 
 struct config_channel_entry
 {
        int use_except;
        int use_invex;
+       int use_forward;
        int use_knock;
        int knock_delay;
        int knock_delay_channel;
@@ -269,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;
@@ -334,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);
@@ -347,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 **);