Fix some warnings in the resolver code.

[solanum.git] / include / s_conf.h

diff --git a/include/s_conf.h b/include/s_conf.h
index 5b9174816f4e916b5e8f97303ef80f8cd35f706d..da08740c84f00ad0418cc2bd0ab3c5a8c13f639a 100644 (file)
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -54,26 +54,22 @@ struct ip_value
 extern FILE *conf_fbfile_in;
 extern char conf_line_in[256];
 
-struct ConfItem\r
-{\r
-       unsigned int status;    /* If CONF_ILLEGAL, delete when no clients */\r
-       unsigned int flags;\r
-       int clients;            /* Number of *LOCAL* clients using this */\r
-\r
-       union\r
-       {\r
-               char *name;             /* IRC name, nick, server name, or original u@h */\r
-               const char *oper;\r
-       } info;\r
-\r
-       char *host;             /* host part of user@host */\r
-       char *passwd;           /* doubles as kline reason *ugh* */\r
-       char *spasswd;          /* Password to send. */\r
-       char *user;             /* user part of user@host */\r
-       int port;\r
-       time_t hold;            /* Hold action until this time (calendar time) */\r
-       struct Class *c_class;  /* Class of connection */\r
-       rb_patricia_node_t *pnode;\r
+struct ConfItem
+{
+       struct ConfItem *next;  /* list node pointer */
+       unsigned int status;    /* If CONF_ILLEGAL, delete when no clients */
+       unsigned int flags;
+       int clients;            /* Number of *LOCAL* clients using this */
+       char *name;             /* IRC name, nick, server name, or original u@h */
+       char *host;             /* host part of user@host */
+       char *passwd;           /* doubles as kline reason *ugh* */
+       char *spasswd;          /* Password to send. */
+       char *user;             /* user part of user@host */
+       int port;
+       time_t hold;            /* Hold action until this time (calendar time) */
+       char *className;        /* Name of class */
+       struct Class *c_class;  /* Class of connection */
+       rb_patricia_node_t *pnode;      /* Our patricia node */
 };
 
 #define CONF_ILLEGAL            0x80000000
@@ -275,15 +271,19 @@ struct server_info
        char *network_desc;
        int hub;
        struct sockaddr_in ip;
-#ifdef IPV6
+       int default_max_clients;
+#ifdef RB_IPV6
        struct sockaddr_in6 ip6;
 #endif
        int specific_ipv4_vhost;
-#ifdef IPV6
+#ifdef RB_IPV6
        int specific_ipv6_vhost;
 #endif
-
-       int max_clients;
+       char *ssl_private_key;\r
+       char *ssl_ca_cert;\r
+       char *ssl_cert;\r
+       char *ssl_dh_params;\r
+       int ssld_count;
 };
 
 struct admin_info
@@ -341,8 +341,8 @@ 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 **);
-void get_printable_kline(struct Client *, struct ConfItem *,\r
-                               const char **, const char **, const char **, const char **);
+extern void get_printable_kline(struct Client *, struct ConfItem *,
+                               char **, char **, char **, char **);
 
 extern void yyerror(const char *);
 extern int conf_yy_fatal_error(const char *);