Merge links_cache into scache and rework scache.

[solanum.git] / include / s_conf.h

diff --git a/include/s_conf.h b/include/s_conf.h
index 29bc389a7ef20eeb37dc9ee8f5e63df137e3df74..2b69e6a12adf9319e9e66b47133e21efe8fe8840 100644 (file)
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_conf.h 3446 2007-05-14 22:21:16Z jilles $
+ *  $Id: s_conf.h 3550 2007-08-09 06:47:26Z nenolod $
  */
 
 #ifndef INCLUDED_s_conf_h
@@ -276,7 +276,6 @@ struct config_server_hide
 {
        int flatten_links;
        int links_delay;
-       int links_disabled;
        int hidden;
        int disable_hidden;
 };
@@ -289,7 +288,6 @@ struct server_info
        char *network_name;
        char *network_desc;
        int hub;
-       int use_ts6;
        struct sockaddr_in ip;
 #ifdef IPV6
        struct sockaddr_in6 ip6;
@@ -353,8 +351,6 @@ extern int check_client(struct Client *client_p, struct Client *source_p, const
 
 extern int detach_conf(struct Client *);
 
-extern struct ConfItem *conf_connect_allowed(struct sockaddr *addr, int);
-
 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 *,