diff options
Diffstat (limited to 'include/struct.h')
| -rw-r--r-- | include/struct.h | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/include/struct.h b/include/struct.h index 5cad78a03..115cb0037 100644 --- a/include/struct.h +++ b/include/struct.h @@ -247,14 +247,23 @@ typedef unsigned int u_int32_t; /* XXX Hope this works! */ #define UMODE_BOT 0x400000 /* User is a bot */ #define UMODE_SECURE 0x800000 /* User is a secure connect */ #define UMODE_FCLIENT 0x1000000 /* recieve client on far connects.. */ -#define UMODE_HIDING 0x2000000 /* Totally invisible .. */ + +#ifdef ENABLE_INVISOPER + #define UMODE_HIDING 0x2000000 /* Totally invisible .. */ +#endif + #define UMODE_VICTIM 0x8000000 /* Intentional Victim */ #define UMODE_DEAF 0x10000000 #define UMODE_HIDEOPER 0x20000000 /* Hide oper mode */ #define UMODE_SETHOST 0x40000000 /* used sethost */ #define UMODE_STRIPBADWORDS 0x80000000 /* */ -#define SEND_UMODES (UMODE_INVISIBLE|UMODE_OPER|UMODE_WALLOP|UMODE_FAILOP|UMODE_HELPOP|UMODE_REGNICK|UMODE_SADMIN|UMODE_NETADMIN|UMODE_COADMIN|UMODE_ADMIN|UMODE_SERVICES|UMODE_HIDE|UMODE_EYES|UMODE_WHOIS|UMODE_KIX|UMODE_BOT|UMODE_SECURE|UMODE_FCLIENT|UMODE_HIDING|UMODE_DEAF|UMODE_VICTIM|UMODE_HIDEOPER|UMODE_SETHOST|UMODE_STRIPBADWORDS|UMODE_JUNK) +#ifdef ENABLE_INVISOPER + #define SEND_UMODES (UMODE_INVISIBLE|UMODE_OPER|UMODE_WALLOP|UMODE_FAILOP|UMODE_HELPOP|UMODE_REGNICK|UMODE_SADMIN|UMODE_NETADMIN|UMODE_COADMIN|UMODE_ADMIN|UMODE_SERVICES|UMODE_HIDE|UMODE_EYES|UMODE_WHOIS|UMODE_KIX|UMODE_BOT|UMODE_SECURE|UMODE_FCLIENT|UMODE_HIDING|UMODE_DEAF|UMODE_VICTIM|UMODE_HIDEOPER|UMODE_SETHOST|UMODE_STRIPBADWORDS|UMODE_JUNK) +#else + #define SEND_UMODES (UMODE_INVISIBLE|UMODE_OPER|UMODE_WALLOP|UMODE_FAILOP|UMODE_HELPOP|UMODE_REGNICK|UMODE_SADMIN|UMODE_NETADMIN|UMODE_COADMIN|UMODE_ADMIN|UMODE_SERVICES|UMODE_HIDE|UMODE_EYES|UMODE_WHOIS|UMODE_KIX|UMODE_BOT|UMODE_SECURE|UMODE_FCLIENT|UMODE_DEAF|UMODE_VICTIM|UMODE_HIDEOPER|UMODE_SETHOST|UMODE_STRIPBADWORDS|UMODE_JUNK) +#endif + #define ALL_UMODES (SEND_UMODES|UMODE_SERVNOTICE|UMODE_LOCOP|UMODE_KILLS|UMODE_CLIENT|UMODE_FLOOD|UMODE_SERVICES|UMODE_EYES) #define FLAGS_ID (FLAGS_DOID|FLAGS_GOTID) @@ -283,7 +292,10 @@ typedef unsigned int u_int32_t; /* XXX Hope this works! */ #define IsKix(x) ((x)->umodes & UMODE_KIX) #define IsHelpOp(x) ((x)->umodes & UMODE_HELPOP) #define IsAdmin(x) ((x)->umodes & UMODE_ADMIN) -#define IsHiding(x) ((x)->umodes & UMODE_HIDING) + +#ifdef ENABLE_INVISOPER + #define IsHiding(x) ((x)->umodes & UMODE_HIDING) +#endif #ifdef STRIPBADWORDS #define IsFilteringWords(x) ((x)->umodes & UMODE_STRIPBADWORDS) @@ -451,7 +463,9 @@ typedef unsigned int u_int32_t; /* XXX Hope this works! */ #define OFLAG_AFOUNDER 0x10000000 #define OFLAG_COFOUND 0x20000000 #define OFLAG_WMASTER 0x40000000 -#define OFLAG_INVISIBLE 0x80000000 +#ifdef ENABLE_INVISOPER + #define OFLAG_INVISIBLE 0x80000000 +#endif #define OFLAG_LOCAL (OFLAG_REHASH|OFLAG_HELPOP|OFLAG_GLOBOP|OFLAG_WALLOP|OFLAG_LOCOP|OFLAG_LROUTE|OFLAG_LKILL|OFLAG_KLINE|OFLAG_UNKLINE|OFLAG_LNOTICE|OFLAG_UMODEC|OFLAG_UMODEF) #define OFLAG_GLOBAL (OFLAG_LOCAL|OFLAG_GROUTE|OFLAG_GKILL|OFLAG_GNOTICE) #define OFLAG_ISGLOBAL (OFLAG_GROUTE|OFLAG_GKILL|OFLAG_GNOTICE) @@ -628,7 +642,7 @@ struct ConfItem { #define CONF_RESTRICT 0x0200 #endif #define CONF_CLASS 0x0400 -#define CONF_SERVICE 0x0800 +#define CONF_CHANGEUSERNAME 0x0800 #define CONF_LEAF 0x1000 #define CONF_LISTEN_PORT 0x2000 #define CONF_HUB 0x4000 @@ -648,7 +662,7 @@ struct ConfItem { #define CONF_VERSION 0x40000000 #define CONF_OPS (CONF_OPERATOR | CONF_LOCOP) #define CONF_SERVER_MASK (CONF_CONNECT_SERVER | CONF_NOCONNECT_SERVER) -#define CONF_CLIENT_MASK (CONF_CLIENT | CONF_SERVICE | CONF_OPS | \ +#define CONF_CLIENT_MASK (CONF_CLIENT| CONF_OPS | \ CONF_SERVER_MASK) #define CONF_CRULE (CONF_CRULEALL | CONF_CRULEAUTO) #define CONF_QUARANTINE (CONF_QUARANTINED_SERVER|CONF_QUARANTINED_NICK) @@ -1043,7 +1057,11 @@ struct Channel { #define MODE_NOKNOCK 0x800000 #define MODE_NOINVITE 0x1000000 #define MODE_FLOODLIMIT 0x2000000 -#define MODE_NOHIDING 0x4000000 + +#ifdef ENABLE_INVISOPER + #define MODE_NOHIDING 0x4000000 +#endif + #ifdef STRIPBADWORDS #define MODE_STRIPBADWORDS 0x8000000 #endif |