summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authormichael <michael@82007160-df01-0410-b94d-b575c5fd34c7>2012-11-10 19:27:13 +0000
committermichael <michael@82007160-df01-0410-b94d-b575c5fd34c7>2012-11-10 19:27:13 +0000
commitcdb16f35bef2e73b52d4ba402d5b07c890d14be8 (patch)
tree0037ea63a03b198a84ca147296b8f7c8ca2f0838 /include
parent068f769876940baf8e76c9597e8ee5c0f73c48bc (diff)
- minor MaskItem structure cleanup
git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/trunk@1649 82007160-df01-0410-b94d-b575c5fd34c7
Diffstat (limited to 'include')
-rw-r--r--include/conf.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/conf.h b/include/conf.h
index bde3956..97d5cf8 100644
--- a/include/conf.h
+++ b/include/conf.h
@@ -97,19 +97,18 @@ struct MaskItem
unsigned int htype;
unsigned int ref_count; /* Number of *LOCAL* clients using this */
int bits;
- time_t hold; /* Hold action until this time (calendar time) */
+ time_t until; /* Hold action until this time (calendar time) */
time_t setat;
struct irc_ssaddr bind; /* ip to bind to for outgoing connect */
struct irc_ssaddr addr; /* ip to connect to */
struct ClassItem *class; /* Class of connection */
char *name;
+ char *user; /* user part of user@host */
char *host; /* host part of user@host */
char *passwd;
char *spasswd; /* Password to send. */
char *reason;
- char *user; /* user part of user@host */
char *cipher_list;
- char *rsa_public_key_file;
void *rsa_public_key;
void *regexuser;
void *regexhost;
@@ -147,7 +146,6 @@ struct CidrItem
#define CONF_FLAGS_IN_DATABASE 0x00008000
#define CONF_FLAGS_EXEMPTRESV 0x00010000
#define CONF_FLAGS_SSL 0x00020000
-#define CONF_FLAGS_MAINCONF 0x00040000
/* Macros for struct MaskItem */
#define IsLimitIp(x) ((x)->flags & CONF_FLAGS_LIMIT_IP)