ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/src/conf.c
(Generate patch)

Comparing ircd-hybrid-7.2/src/s_conf.c (file contents):
Revision 1005 by michael, Mon Aug 31 23:07:43 2009 UTC vs.
Revision 1009 by michael, Sun Sep 13 15:02:30 2009 UTC

# Line 291 | Line 291 | make_conf_item(ConfType type)
291                                         sizeof(struct MatchItem));
292      dlinkAdd(conf, &conf->node, &xconf_items);
293      break;
294 <
294 > #ifdef HAVE_LIBPCRE
295    case RXLINE_TYPE:
296      conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
297                                         sizeof(struct MatchItem));
# Line 305 | Line 305 | make_conf_item(ConfType type)
305      aconf->status = CONF_KLINE;
306      dlinkAdd(conf, &conf->node, &rkconf_items);
307      break;
308 <
308 > #endif
309    case CLUSTER_TYPE:
310      conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem));
311      dlinkAdd(conf, &conf->node, &cluster_items);
# Line 463 | Line 463 | delete_conf_item(struct ConfItem *conf)
463      dlinkDelete(&conf->node, &xconf_items);
464      MyFree(conf);
465      break;
466 <
466 > #ifdef HAVE_LIBPCRE
467    case RKLINE_TYPE:
468      aconf = map_to_conf(conf);
469      MyFree(aconf->regexuser);
# Line 486 | Line 486 | delete_conf_item(struct ConfItem *conf)
486      dlinkDelete(&conf->node, &rxconf_items);
487      MyFree(conf);
488      break;
489 <
489 > #endif
490    case NRESV_TYPE:
491      match_item = map_to_conf(conf);
492      MyFree(match_item->user);
# Line 613 | Line 613 | report_confitem_types(struct Client *sou
613      }
614      break;
615  
616 + #ifdef HAVE_LIBPCRE
617    case RXLINE_TYPE:
618      DLINK_FOREACH(ptr, rxconf_items.head)
619      {
# Line 641 | Line 642 | report_confitem_types(struct Client *sou
642                   aconf->reason, aconf->oper_reason ? aconf->oper_reason : "");
643      }
644      break;
645 + #endif
646  
647    case ULINE_TYPE:
648      DLINK_FOREACH(ptr, uconf_items.head)
# Line 785 | Line 787 | report_confitem_types(struct Client *sou
787    case CRESV_TYPE:
788    case NRESV_TYPE:
789    case CLUSTER_TYPE:
790 +  default:
791      break;
792    }
793   }
# Line 1572 | Line 1575 | find_matching_name_conf(ConfType type, c
1575  
1576    switch (type)
1577    {
1578 <    case RXLINE_TYPE:
1578 > #ifdef HAVE_LIBPCRE
1579 >  case RXLINE_TYPE:
1580        DLINK_FOREACH(ptr, list_p->head)
1581        {
1582          conf = ptr->data;
# Line 1582 | Line 1586 | find_matching_name_conf(ConfType type, c
1586            return conf;
1587        }
1588        break;
1589 <
1589 > #endif
1590    case XLINE_TYPE:
1591    case ULINE_TYPE:
1592    case NRESV_TYPE:
# Line 2056 | Line 2060 | conf_connect_allowed(struct irc_ssaddr *
2060   static struct AccessItem *
2061   find_regexp_kline(const char *uhi[])
2062   {
2063 + #ifdef HAVE_LIBPCRE
2064    const dlink_node *ptr = NULL;
2065  
2066    DLINK_FOREACH(ptr, rkconf_items.head)
# Line 2070 | Line 2075 | find_regexp_kline(const char *uhi[])
2075           !ircd_pcre_exec(aptr->regexhost, uhi[2])))
2076        return aptr;
2077    }
2078 <
2078 > #endif
2079    return NULL;
2080   }
2081  
# Line 2471 | Line 2476 | read_conf_files(int cold)
2476     */
2477    rebuild_isupport_message_line();
2478  
2479 <  parse_conf_file(KLINE_TYPE, cold);
2479 > #ifdef HAVE_LIBPCRE
2480    parse_conf_file(RKLINE_TYPE, cold);
2481 +  parse_conf_file(RXLINE_TYPE, cold);
2482 + #endif
2483 +  parse_conf_file(KLINE_TYPE, cold);
2484    parse_conf_file(DLINE_TYPE, cold);
2485    parse_conf_file(XLINE_TYPE, cold);
2478 –  parse_conf_file(RXLINE_TYPE, cold);
2486    parse_conf_file(NRESV_TYPE, cold);
2487    parse_conf_file(CRESV_TYPE, cold);
2488   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)