Remove unused kline delay machinery

[solanum.git] / include / hostmask.h

diff --git a/include/hostmask.h b/include/hostmask.h
index 43dadc0a3877b90d4700c806a9c13629b56f3f22..bb41b6c2f94fc91896824be05648cbb0ec07e01e 100644 (file)
--- a/include/hostmask.h
+++ b/include/hostmask.h
@@ -28,10 +28,8 @@
 enum
 {
        HM_HOST,
-       HM_IPV4
-#ifdef RB_IPV6
-               , HM_IPV6
-#endif
+       HM_IPV4,
+       HM_IPV6,
 };
 
 int parse_netmask(const char *, struct rb_sockaddr_storage *, int *);
@@ -54,12 +52,10 @@ struct ConfItem *find_dline(struct sockaddr *, int);
 #define find_kline(x)  (find_conf_by_address((x)->host, (x)->sockhost, \
                         (x)->orighost, \
                         (struct sockaddr *)&(x)->localClient->ip, CONF_KILL,\
-                        (x)->localClient->ip.ss_family, (x)->username, NULL))
+                        GET_SS_FAMILY(&(x)->localClient->ip), (x)->username, NULL))
 
 void report_auth(struct Client *);
-#ifdef RB_IPV6
 int match_ipv6(struct sockaddr *, struct sockaddr *, int);
-#endif
 int match_ipv4(struct sockaddr *, struct sockaddr *, int);
 
 /* Hashtable stuff... */