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

Comparing ircd-hybrid-8/include/conf.h (file contents):
Revision 1368 by michael, Wed Apr 25 16:42:06 2012 UTC vs.
Revision 1369 by michael, Wed Apr 25 19:04:19 2012 UTC

# Line 193 | Line 193 | struct CidrItem
193   #define CONF_CLIENT             0x00000002
194   #define CONF_SERVER             0x00000004
195   #define CONF_OPERATOR           0x00000008
196 < #define CONF_KILL               0x00000010
197 < #define CONF_KLINE              CONF_KILL
196 > #define CONF_KLINE              0x00000010
197   #define CONF_CLASS              0x00000020
198   #define CONF_LEAF               0x00000040
199   #define CONF_LISTEN_PORT        0x00000080
# Line 225 | Line 224 | struct CidrItem
224   #define IsConfLeaf(x)           ((x)->status == CONF_LEAF)
225   #define SetConfLeaf(x)          ((x)->status = CONF_LEAF)
226   #define IsConfHubOrLeaf(x)      ((x)->status & (CONF_HUB|CONF_LEAF))
227 < #define IsConfKill(x)           ((x)->status == CONF_KILL)
227 > #define IsConfKill(x)           ((x)->status == CONF_KLINE)
228   #define IsConfClient(x)         ((x)->status & CONF_CLIENT)
229   #define IsConfTypeOfClient(x)   ((x)->status & CONF_CLIENT_MASK)
230   #define IsConfUline(x)          ((x)->status & CONF_ULINE)
# Line 463 | Line 462 | extern dlink_list rxconf_items;
462   extern dlink_list rkconf_items;
463   extern dlink_list leaf_items;
464   extern dlink_list service_items;
466 extern dlink_list temporary_klines;
467 extern dlink_list temporary_dlines;
468 extern dlink_list temporary_glines;
465   extern dlink_list temporary_xlines;
466   extern struct logging_entry ConfigLoggingEntry;
467   extern struct config_file_entry ConfigFileEntry;/* defined in ircd.c*/
# Line 520 | Line 516 | extern void conf_add_class_to_conf(struc
516  
517   /* XXX consider moving these into csvlib.h */
518   extern void parse_csv_file(FILE *, ConfType);
519 <
519 > extern int find_and_delete_temporary(const char *, const char *, int);
520   extern const char *get_oper_name(const struct Client *);
521  
522   extern void *map_to_conf(struct ConfItem *);
# Line 544 | Line 540 | extern int match_conf_password(const cha
540   #define BANNED_CLIENT     (-4)
541   #define TOO_FAST          (-5)
542  
543 < #define CLEANUP_TKLINES_TIME 60
543 > #define CLEANUP_TKLINES_TIME 5
544  
545   extern void cluster_a_line(struct Client *,
546                             const char *, int, int, const char *,...);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines