/[svn]/ircd-hybrid/trunk/src/conf.c
ViewVC logotype

Diff of /ircd-hybrid/trunk/src/conf.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1651 by michael, Sat Nov 10 19:27:13 2012 UTC revision 1652 by michael, Tue Nov 13 20:28:53 2012 UTC
# Line 969  attach_connect_block(struct Client *clie Line 969  attach_connect_block(struct Client *clie
969    {    {
970      conf = ptr->data;      conf = ptr->data;
971    
972      if (match(conf->name, name) == 0 || match(conf->host, host) == 0)      if (match(conf->name, name) || match(conf->host, host))
973        continue;        continue;
974    
975      attach_conf(client_p, conf);      attach_conf(client_p, conf);
# Line 1001  find_conf_name(dlink_list *list, const c Line 1001  find_conf_name(dlink_list *list, const c
1001      if (conf->type == type)      if (conf->type == type)
1002      {      {
1003        if (conf->name && (irccmp(conf->name, name) == 0 ||        if (conf->name && (irccmp(conf->name, name) == 0 ||
1004                           match(conf->name, name)))                           !match(conf->name, name)))
1005        return conf;        return conf;
1006      }      }
1007    }    }
# Line 1113  find_matching_name_conf(enum maskitem_ty Line 1113  find_matching_name_conf(enum maskitem_ty
1113            continue;            continue;
1114          if (EmptyString(conf->user) || EmptyString(conf->host))          if (EmptyString(conf->user) || EmptyString(conf->host))
1115            return conf;            return conf;
1116          if (match(conf->user, user) && match(conf->host, host))          if (!match(conf->user, user) && !match(conf->host, host))
1117            return conf;            return conf;
1118        }        }
1119      }      }
# Line 1124  find_matching_name_conf(enum maskitem_ty Line 1124  find_matching_name_conf(enum maskitem_ty
1124      {      {
1125        conf = ptr->data;        conf = ptr->data;
1126    
1127        if ((name != NULL) && match(name, conf->name))        if ((name != NULL) && !match(name, conf->name))
1128          return conf;          return conf;
1129        else if ((host != NULL) && match(host, conf->host))        else if ((host != NULL) && !match(host, conf->host))
1130          return conf;          return conf;
1131      }      }
1132      break;      break;
# Line 1174  find_exact_name_conf(enum maskitem_type Line 1174  find_exact_name_conf(enum maskitem_type
1174            return (conf);            return (conf);
1175          if (EmptyString(conf->user) || EmptyString(conf->host))          if (EmptyString(conf->user) || EmptyString(conf->host))
1176            return (conf);            return (conf);
1177          if (match(conf->user, user) && match(conf->host, host))          if (!match(conf->user, user) && !match(conf->host, host))
1178            return (conf);            return (conf);
1179        }        }
1180      }      }
# Line 1194  find_exact_name_conf(enum maskitem_type Line 1194  find_exact_name_conf(enum maskitem_type
1194            return conf;            return conf;
1195          if (EmptyString(conf->user) || EmptyString(conf->host))          if (EmptyString(conf->user) || EmptyString(conf->host))
1196            return NULL;            return NULL;
1197          if (match(conf->user, who->username))          if (!match(conf->user, who->username))
1198          {          {
1199            switch (conf->htype)            switch (conf->htype)
1200            {            {
1201              case HM_HOST:              case HM_HOST:
1202                if (match(conf->host, who->host) || match(conf->host, who->sockhost))                if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
1203                  if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)                  if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
1204                    return conf;                    return conf;
1205                break;                break;

Legend:
Removed from v.1651  
changed lines
  Added in v.1652

svnadmin@ircd-hybrid.org
ViewVC Help
Powered by ViewVC 1.1.28