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

Comparing ircd-hybrid/branches/8.2.x/src/conf.c (file contents):
Revision 5559 by michael, Sat Feb 14 19:39:06 2015 UTC vs.
Revision 5582 by michael, Sun Feb 15 14:42:58 2015 UTC

# Line 292 | Line 292 | static int
292   verify_access(struct Client *client_p)
293   {
294    struct MaskItem *conf = NULL;
295  char non_ident[USERLEN + 1] = "~";
295  
296    if (IsGotId(client_p))
297    {
# Line 303 | Line 302 | verify_access(struct Client *client_p)
302    }
303    else
304    {
305 +    char non_ident[USERLEN + 1] = "~";
306 +
307      strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
308      conf = find_address_conf(client_p->host, non_ident,
309                               &client_p->connection->ip,
# Line 1040 | Line 1041 | expire_tklines(dlink_list *list)
1041      {
1042        if (ConfigGeneral.tkline_expire_notices)
1043          sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1044 <                               "Temporary X-line for [%s] expired", conf->name);
1044 >                             "Temporary X-line for [%s] expired", conf->name);
1045        conf_free(conf);
1046      }
1047      else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1048      {
1049        if (ConfigGeneral.tkline_expire_notices)
1050          sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1051 <                               "Temporary RESV for [%s] expired", conf->name);
1051 >                             "Temporary RESV for [%s] expired", conf->name);
1052        conf_free(conf);
1053      }
1054    }
# Line 1208 | Line 1209 | clear_out_old_conf(void)
1209    motd_clear();
1210  
1211    /*
1212 <   * don't delete the class table, rather mark all entries
1213 <   * for deletion. The table is cleaned up by class_delete_marked. - avalon
1212 >   * Don't delete the class table, rather mark all entries for deletion.
1213 >   * The table is cleaned up by class_delete_marked. - avalon
1214     */
1215    class_mark_for_deletion();
1216  
1217    clear_out_address_conf();
1218  
1219 <  /* clean out module paths */
1219 >  /* Clean out module paths */
1220    mod_clear_paths();
1221  
1222    pseudo_clear();
1223  
1224 <  /* clean out ConfigServerInfo */
1224 >  /* Clean out ConfigServerInfo */
1225    MyFree(ConfigServerInfo.description);
1226    ConfigServerInfo.description = NULL;
1227    MyFree(ConfigServerInfo.network_name);
# Line 1238 | Line 1239 | clear_out_old_conf(void)
1239    ConfigServerInfo.rsa_private_key_file = NULL;
1240   #endif
1241  
1242 <  /* clean out ConfigAdminInfo */
1242 >  /* Clean out ConfigAdminInfo */
1243    MyFree(ConfigAdminInfo.name);
1244    ConfigAdminInfo.name = NULL;
1245    MyFree(ConfigAdminInfo.email);
# Line 1246 | Line 1247 | clear_out_old_conf(void)
1247    MyFree(ConfigAdminInfo.description);
1248    ConfigAdminInfo.description = NULL;
1249  
1250 <  /* clean out listeners */
1250 >  /* Clean out listeners */
1251    close_listeners();
1252   }
1253  
# Line 1424 | Line 1425 | valid_tkline(const char *data, const int
1425  
1426    /*
1427     * In the degenerate case where oper does a /quote kline 0 user@host :reason
1428 <   * i.e. they specifically use 0, I am going to return 1 instead
1429 <   * as a return value of non-zero is used to flag it as a temporary kline
1428 >   * i.e. they specifically use 0, I am going to return 1 instead as a return
1429 >   * value of non-zero is used to flag it as a temporary kline
1430     */
1431    if (result == 0)
1432      result = 1;
# Line 1440 | Line 1441 | valid_tkline(const char *data, const int
1441    if (result > MAX_TDKLINE_TIME)
1442      result = MAX_TDKLINE_TIME;
1443  
1444 <  result = result * 60;  /* turn it into seconds */
1444 >  result = result * 60;  /* Turn it into seconds */
1445  
1446    return result;
1447   }
# Line 1600 | Line 1601 | find_user_host(struct Client *source_p,
1601      }
1602  
1603      /*
1604 <     * turn the "user" bit into "*user", blow away '~'
1604 >     * Turn the "user" bit into "*user", blow away '~'
1605       * if found in original user name (non-idented)
1606       */
1607      strlcpy(luser, target_p->username, USERLEN*4 + 1);
# Line 1821 | Line 1822 | match_conf_password(const char *password
1822   *                along to all servers that match capab and cluster type
1823   */
1824   void
1825 < cluster_a_line(struct Client *source_p, const char *command,
1826 <               int capab, int cluster_type, const char *pattern, ...)
1825 > cluster_a_line(struct Client *source_p, const char *command, int capab,
1826 >               int cluster_type, const char *pattern, ...)
1827   {
1828    va_list args;
1829    char buffer[IRCD_BUFSIZE] = "";
# Line 1837 | Line 1838 | cluster_a_line(struct Client *source_p,
1838      const struct MaskItem *conf = node->data;
1839  
1840      if (conf->flags & cluster_type)
1841 <      sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
1841 >      sendto_match_servs(source_p, conf->name, CAP_CLUSTER | capab,
1842                           "%s %s %s", command, conf->name, buffer);
1843    }
1844   }
# Line 1923 | Line 1924 | split_nuh(struct split_nuh_item *const i
1924      }
1925      else
1926      {
1927 <      /* no @ found */
1927 >      /* No @ found */
1928        if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1929          strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1930        else

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines