/[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 1592 by michael, Sat Oct 27 21:02:32 2012 UTC revision 1618 by michael, Tue Oct 30 21:04:38 2012 UTC
# Line 760  check_client(va_list args) Line 760  check_client(va_list args)
760    switch (i)    switch (i)
761    {    {
762      case TOO_MANY:      case TOO_MANY:
763        sendto_realops_flags(UMODE_FULL, L_ALL,        sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
764                             "Too many on IP for %s (%s).",                             "Too many on IP for %s (%s).",
765                             get_client_name(source_p, SHOW_IP),                             get_client_name(source_p, SHOW_IP),
766                             source_p->sockhost);                             source_p->sockhost);
# Line 771  check_client(va_list args) Line 771  check_client(va_list args)
771        break;        break;
772    
773      case I_LINE_FULL:      case I_LINE_FULL:
774        sendto_realops_flags(UMODE_FULL, L_ALL,        sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
775                             "I-line is full for %s (%s).",                             "auth{} block is full for %s (%s).",
776                             get_client_name(source_p, SHOW_IP),                             get_client_name(source_p, SHOW_IP),
777                             source_p->sockhost);                             source_p->sockhost);
778        ilog(LOG_TYPE_IRCD, "Too many connections from %s.",        ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
# Line 786  check_client(va_list args) Line 786  check_client(va_list args)
786        ++ServerStats.is_ref;        ++ServerStats.is_ref;
787        /* jdc - lists server name & port connections are on */        /* jdc - lists server name & port connections are on */
788        /*       a purely cosmetical change */        /*       a purely cosmetical change */
789        sendto_realops_flags(UMODE_UNAUTH, L_ALL,        sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
790                             "Unauthorized client connection from %s [%s] on [%s/%u].",                             "Unauthorized client connection from %s [%s] on [%s/%u].",
791                             get_client_name(source_p, SHOW_IP),                             get_client_name(source_p, SHOW_IP),
792                             source_p->sockhost,                             source_p->sockhost,
# Line 875  verify_access(struct Client *client_p, c Line 875  verify_access(struct Client *client_p, c
875          conf = unmap_conf_item(aconf);          conf = unmap_conf_item(aconf);
876    
877          if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(aconf))          if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(aconf))
878            sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s spoofing: %s as %s",            sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
879                                   "%s spoofing: %s as %s",
880                                 client_p->name, client_p->host, conf->name);                                 client_p->name, client_p->host, conf->name);
881          strlcpy(client_p->host, conf->name, sizeof(client_p->host));          strlcpy(client_p->host, conf->name, sizeof(client_p->host));
882          SetIPSpoof(client_p);          SetIPSpoof(client_p);
# Line 1685  int Line 1686  int
1686  rehash(int sig)  rehash(int sig)
1687  {  {
1688    if (sig != 0)    if (sig != 0)
1689      sendto_realops_flags(UMODE_ALL, L_ALL,      sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1690                           "Got signal SIGHUP, reloading ircd.conf file");                           "Got signal SIGHUP, reloading ircd.conf file");
1691    
1692    restart_resolver();    restart_resolver();
# Line 2077  expire_tklines(dlink_list *tklist) Line 2078  expire_tklines(dlink_list *tklist)
2078        if (xconf->hold <= CurrentTime)        if (xconf->hold <= CurrentTime)
2079        {        {
2080          if (ConfigFileEntry.tkline_expire_notices)          if (ConfigFileEntry.tkline_expire_notices)
2081            sendto_realops_flags(UMODE_ALL, L_ALL,            sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
2082                                 "Temporary X-line for [%s] sexpired", conf->name);                                 "Temporary X-line for [%s] expired", conf->name);
2083          dlinkDelete(ptr, tklist);          dlinkDelete(ptr, tklist);
2084          free_dlink_node(ptr);          free_dlink_node(ptr);
2085          delete_conf_item(conf);          delete_conf_item(conf);
# Line 2090  expire_tklines(dlink_list *tklist) Line 2091  expire_tklines(dlink_list *tklist)
2091        if (nconf->hold <= CurrentTime)        if (nconf->hold <= CurrentTime)
2092        {        {
2093          if (ConfigFileEntry.tkline_expire_notices)          if (ConfigFileEntry.tkline_expire_notices)
2094            sendto_realops_flags(UMODE_ALL, L_ALL,            sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
2095                                 "Temporary RESV for [%s] expired", conf->name);                                 "Temporary RESV for [%s] expired", conf->name);
2096          dlinkDelete(ptr, tklist);          dlinkDelete(ptr, tklist);
2097          free_dlink_node(ptr);          free_dlink_node(ptr);
# Line 2103  expire_tklines(dlink_list *tklist) Line 2104  expire_tklines(dlink_list *tklist)
2104        if (cconf->hold <= CurrentTime)        if (cconf->hold <= CurrentTime)
2105        {        {
2106          if (ConfigFileEntry.tkline_expire_notices)          if (ConfigFileEntry.tkline_expire_notices)
2107            sendto_realops_flags(UMODE_ALL, L_ALL,            sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
2108                                 "Temporary RESV for [%s] expired", cconf->name);                                 "Temporary RESV for [%s] expired", cconf->name);
2109          delete_channel_resv(cconf);          delete_channel_resv(cconf);
2110        }        }
# Line 2231  read_conf_files(int cold) Line 2232  read_conf_files(int cold)
2232      }      }
2233      else      else
2234      {      {
2235        sendto_realops_flags(UMODE_ALL, L_ALL,        sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
2236                             "Unable to read configuration file '%s': %s",                             "Unable to read configuration file '%s': %s",
2237                             filename, strerror(errno));                             filename, strerror(errno));
2238        return;        return;
# Line 2294  parse_conf_file(int type, int cold) Line 2295  parse_conf_file(int type, int cold)
2295        ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",        ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
2296             filename, strerror(errno));             filename, strerror(errno));
2297      else      else
2298        sendto_realops_flags(UMODE_ALL, L_ALL,        sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
2299                      "Unable to read configuration file '%s': %s",                      "Unable to read configuration file '%s': %s",
2300                             filename, strerror(errno));                             filename, strerror(errno));
2301    }    }
# Line 2775  conf_add_class_to_conf(struct ConfItem * Line 2776  conf_add_class_to_conf(struct ConfItem *
2776      aconf->class_ptr = class_default;      aconf->class_ptr = class_default;
2777    
2778      if (conf->type == CLIENT_TYPE)      if (conf->type == CLIENT_TYPE)
2779        sendto_realops_flags(UMODE_ALL, L_ALL,        sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
2780                             "Warning *** Defaulting to default class for %s@%s",                             "Warning *** Defaulting to default class for %s@%s",
2781                             aconf->user, aconf->host);                             aconf->user, aconf->host);
2782      else      else
2783        sendto_realops_flags(UMODE_ALL, L_ALL,        sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
2784                             "Warning *** Defaulting to default class for %s",                             "Warning *** Defaulting to default class for %s",
2785                             conf->name);                             conf->name);
2786    }    }
# Line 2792  conf_add_class_to_conf(struct ConfItem * Line 2793  conf_add_class_to_conf(struct ConfItem *
2793    if (aconf->class_ptr == NULL || !class->active)    if (aconf->class_ptr == NULL || !class->active)
2794    {    {
2795      if (conf->type == CLIENT_TYPE)      if (conf->type == CLIENT_TYPE)
2796        sendto_realops_flags(UMODE_ALL, L_ALL,        sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
2797                             "Warning *** Defaulting to default class for %s@%s",                             "Warning *** Defaulting to default class for %s@%s",
2798                             aconf->user, aconf->host);                             aconf->user, aconf->host);
2799      else      else
2800        sendto_realops_flags(UMODE_ALL, L_ALL,        sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
2801                             "Warning *** Defaulting to default class for %s",                             "Warning *** Defaulting to default class for %s",
2802                             conf->name);                             conf->name);
2803      aconf->class_ptr = class_default;      aconf->class_ptr = class_default;
# Line 2819  conf_add_server(struct ConfItem *conf, c Line 2820  conf_add_server(struct ConfItem *conf, c
2820    
2821    if (!aconf->host || !conf->name)    if (!aconf->host || !conf->name)
2822    {    {
2823      sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block");      sendto_realops_flags(UMODE_ALL, L_ALL,  SEND_NOTICE,
2824                             "Bad connect block");
2825      ilog(LOG_TYPE_IRCD, "Bad connect block");      ilog(LOG_TYPE_IRCD, "Bad connect block");
2826      return -1;      return -1;
2827    }    }
2828    
2829    if (EmptyString(aconf->passwd))    if (EmptyString(aconf->passwd))
2830    {    {
2831      sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block, name %s",      sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
2832                             "Bad connect block, name %s",
2833                           conf->name);                           conf->name);
2834      ilog(LOG_TYPE_IRCD, "Bad connect block, host %s", conf->name);      ilog(LOG_TYPE_IRCD, "Bad connect block, host %s", conf->name);
2835      return -1;      return -1;
# Line 2852  yyerror(const char *msg) Line 2855  yyerror(const char *msg)
2855      return;      return;
2856    
2857    strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));    strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
2858    sendto_realops_flags(UMODE_ALL, L_ALL, "\"%s\", line %u: %s: %s",    sendto_realops_flags(UMODE_ALL, L_ALL,  SEND_NOTICE,
2859                           "\"%s\", line %u: %s: %s",
2860                         conffilebuf, lineno + 1, msg, newlinebuf);                         conffilebuf, lineno + 1, msg, newlinebuf);
2861    ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",    ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
2862         conffilebuf, lineno + 1, msg, newlinebuf);         conffilebuf, lineno + 1, msg, newlinebuf);

Legend:
Removed from v.1592  
changed lines
  Added in v.1618

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