Regenerate libratbox configure.

[irc/rqf/shadowircd.git] / src / hostmask.c

diff --git a/src/hostmask.c b/src/hostmask.c
index d02404882ce8cc0de294885dc092e4d211003d74..77929932c422c67d8ff7e044dcb90591693de8c8 100644 (file)
--- a/src/hostmask.c
+++ b/src/hostmask.c
@@ -22,7 +22,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: hostmask.c 2757 2006-11-10 22:58:15Z jilles $
  */
 
 #include "stdinc.h"
@@ -62,7 +61,11 @@ parse_netmask(const char *text, struct sockaddr  *naddr, int *nb)
                addr = (struct rb_sockaddr_storage *)&xaddr;
        else
                addr = (struct rb_sockaddr_storage *)naddr;
-       
+
+       if(strpbrk(ip, "*?") != NULL)
+       {
+               return HM_HOST;
+       }
 #ifdef RB_IPV6
        if(strchr(ip, ':'))
        {       
@@ -386,7 +389,7 @@ find_address_conf(const char *host, const char *sockhost, const char *user,
        /* if theres a spoof, check it against klines.. */
        if(IsConfDoSpoofIp(iconf))
        {
-               char *p = strchr(iconf->name, '@');
+               char *p = strchr(iconf->info.name, '@');
 
                /* note, we dont need to pass sockhost here, as its
                 * guaranteed to not match by whats above.. --anfl
@@ -394,11 +397,11 @@ find_address_conf(const char *host, const char *sockhost, const char *user,
                if(p)
                {
                        *p = '\0';
-                       kconf = find_conf_by_address(p+1, NULL, NULL, ip, CONF_KILL, aftype, iconf->name, NULL);
+                       kconf = find_conf_by_address(p+1, NULL, NULL, ip, CONF_KILL, aftype, iconf->info.name, NULL);
                        *p = '@';
                }
                else
-                       kconf = find_conf_by_address(iconf->name, NULL, NULL, ip, CONF_KILL, aftype, vuser, NULL);
+                       kconf = find_conf_by_address(iconf->info.name, NULL, NULL, ip, CONF_KILL, aftype, vuser, NULL);
 
                if(kconf)
                        return kconf;
@@ -703,7 +706,7 @@ show_iline_prefix(struct Client *sptr, struct ConfItem *aconf, char *name)
 void
 report_auth(struct Client *client_p)
 {
-       char *name, *host, *pass = "*", *user, *classname;
+       char *name, *host, *pass, *user, *classname;
        struct AddressRec *arec;
        struct ConfItem *aconf;
        int i, port;