hunt_server: Disallow wildcarded nicknames.

[irc/rqf/shadowircd.git] / include / hostmask.h

diff --git a/include/hostmask.h b/include/hostmask.h
index 7da25951c9b883b955fb81220ac77b121186baf0..e181293e97c0694ea37eb25e44076622215d2569 100644 (file)
--- a/include/hostmask.h
+++ b/include/hostmask.h
@@ -22,7 +22,6 @@
  *  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
@@ -39,28 +38,24 @@ enum
 int parse_netmask(const char *, struct sockaddr *, 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, 
                                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))
-#define find_gline(x)  (find_conf_by_address((x)->host, (x)->sockhost, \
-                        (x)->orighost, \
-                        (struct sockaddr *)&(x)->localClient->ip, CONF_GLINE,\
-                        (x)->localClient->ip.ss_family, (x)->username))
+                        (x)->localClient->ip.ss_family, (x)->username, NULL))
 
 void report_Klines(struct Client *);
 void report_auth(struct Client *);
@@ -103,6 +98,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. */