| 108 |
|
int ref_count; /* How many times is this matchitem in use */ |
| 109 |
|
int illegal; /* Should it be deleted when possible? */ |
| 110 |
|
time_t hold; /* Hold action until this time (calendar time) */ |
| 111 |
+ |
time_t setat; |
| 112 |
|
}; |
| 113 |
|
|
| 114 |
|
struct AccessItem |
| 129 |
|
char * passwd; |
| 130 |
|
char * spasswd; /* Password to send. */ |
| 131 |
|
char * reason; |
| 131 |
– |
char * oper_reason; |
| 132 |
|
char * user; /* user part of user@host */ |
| 133 |
|
time_t hold; /* Hold action until this time (calendar time) */ |
| 134 |
+ |
time_t setat; |
| 135 |
|
struct ConfItem *class_ptr; /* Class of connection */ |
| 136 |
|
int aftype; |
| 137 |
|
#ifdef HAVE_LIBCRYPTO |
| 230 |
|
#define CONF_FLAGS_TEMPORARY 0x00008000 |
| 231 |
|
#define CONF_FLAGS_EXEMPTRESV 0x00010000 |
| 232 |
|
#define CONF_FLAGS_SSL 0x00020000 |
| 233 |
+ |
#define CONF_FLAGS_MAINCONF 0x00040000 |
| 234 |
|
|
| 235 |
|
/* Macros for struct AccessItem */ |
| 236 |
|
#define IsLimitIp(x) ((x)->flags & CONF_FLAGS_LIMIT_IP) |
| 258 |
|
#define IsConfSSL(x) ((x)->flags & CONF_FLAGS_SSL) |
| 259 |
|
#define SetConfSSL(x) ((x)->flags |= CONF_FLAGS_SSL) |
| 260 |
|
#define ClearConfSSL(x) ((x)->flags &= ~CONF_FLAGS_SSL) |
| 261 |
+ |
#define IsConfMain(x) ((x)->flags & CONF_FLAGS_MAINCONF) |
| 262 |
+ |
#define SetConfMain(x) ((x)->flags |= CONF_FLAGS_MAINCONF) |
| 263 |
+ |
#define ClearConfMain(x) ((x)->flags &= ~CONF_FLAGS_MAINCONF) |
| 264 |
|
|
| 265 |
|
/* shared/cluster server entry types |
| 266 |
|
* These defines are used for both shared and cluster. |
| 409 |
|
extern dlink_list server_items; |
| 410 |
|
extern dlink_list cluster_items; |
| 411 |
|
extern dlink_list hub_items; |
| 412 |
+ |
extern dlink_list xconf_items; |
| 413 |
|
extern dlink_list rxconf_items; |
| 414 |
|
extern dlink_list rkconf_items; |
| 415 |
|
extern dlink_list leaf_items; |
| 462 |
|
const char *); |
| 463 |
|
extern void add_temp_line(struct ConfItem *); |
| 464 |
|
extern void cleanup_tklines(void *); |
| 459 |
– |
extern const char *get_conf_name(ConfType); |
| 465 |
|
extern int rehash(int); |
| 466 |
|
extern int conf_add_server(struct ConfItem *, const char *); |
| 467 |
|
extern void conf_add_class_to_conf(struct ConfItem *, const char *); |
| 468 |
|
|
| 464 |
– |
/* XXX consider moving these into csvlib.h */ |
| 465 |
– |
extern void parse_csv_file(FILE *, ConfType); |
| 469 |
|
extern int find_and_delete_temporary(const char *, const char *, int); |
| 470 |
|
extern const char *get_oper_name(const struct Client *); |
| 471 |
|
|