bandb: sqlite3: use getpagesize() on FreeBSD

[solanum.git] / include / hostmask.h

diff --git a/include/hostmask.h b/include/hostmask.h
index ee49dda4196b5aae53b3b6488b1dcf5ffb69e6ef..8e97cf74bfbc7aa10c83e1fc86bece16131ab382 100644 (file)
--- a/include/hostmask.h
+++ b/include/hostmask.h
@@ -21,8 +21,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: hostmask.h 2757 2006-11-10 22:58:15Z jilles $
  */
 
 #ifndef INCLUDE_hostmask_h
@@ -36,29 +34,28 @@ enum
 #endif
 };
 
-int parse_netmask(const char *, struct sockaddr *, int *);
+int parse_netmask(const char *, struct rb_sockaddr_storage *, int *);
 struct ConfItem *find_conf_by_address(const char *host, const char *sockhost,
                                      const char *orighost, struct sockaddr *,
-                                     int, int, const char *);
+                                     int, int, const char *, const char *);
 struct ConfItem *find_exact_conf_by_address(const char *address, int type,
                                            const char *username);
-void add_conf_by_address(const char *, int, const char *, struct ConfItem *);
+void add_conf_by_address(const char *, int, const char *, const char *, struct ConfItem *);
 void delete_one_address_conf(const char *, struct ConfItem *);
 void clear_out_address_conf(void);
 void clear_out_address_conf_bans(void);
 void init_host_hash(void);
-struct ConfItem *find_address_conf(const char *host, const char *sockhost, 
+struct ConfItem *find_address_conf(const char *host, const char *sockhost,
                                const char *, const char *, struct sockaddr *,
-                               int);
+                               int, char *);
 
 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))
+                        GET_SS_FAMILY(&(x)->localClient->ip), (x)->username, NULL))
 
-void report_Klines(struct Client *);
 void report_auth(struct Client *);
 #ifdef RB_IPV6
 int match_ipv6(struct sockaddr *, struct sockaddr *, int);
@@ -99,6 +96,8 @@ struct AddressRec
 
        /* Only checked if !(type & 1)... */
        const char *username;
+       /* Only checked if type == CONF_CLIENT */
+       const char *auth_user;
        struct ConfItem *aconf;
 
        /* The next record in this hash bucket. */