client: drop no longer existent 'struct blacklist' definition.

[solanum.git] / include / client.h

diff --git a/include/client.h b/include/client.h
index 9ded2c87df29ac5e0259485a6117759e0a23e784..0f132160a76c6011c9a2cecaf2f0f2da82f15b58 100644 (file)
--- a/include/client.h
+++ b/include/client.h
@@ -36,9 +36,6 @@
 #include "ircd.h"
 #include "privilege.h"
 
-/* other structs */
-struct Blacklist;
-
 /* we store ipv6 ips for remote clients, so this needs to be v6 always */
 #define HOSTIPLEN      53      /* sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255.ipv6") */
 #define PASSWDLEN      128
@@ -79,6 +76,9 @@ struct User
        char *away;             /* pointer to away message */
        int refcnt;             /* Number of times this block is referenced */
 
+       char *opername; /* name of operator{} block being used or tried (challenge) */
+       struct PrivilegeSet *privset;
+
        char suser[NICKLEN+1];
 };
 
@@ -225,7 +225,6 @@ struct LocalUser
         */
        char *passwd;
        char *auth_user;
-       char *opername; /* name of operator{} block being used or tried (challenge) */
        char *challenge;
        char *fullcaps;
        char *cipher_string;
@@ -282,8 +281,6 @@ struct LocalUser
        uint16_t cork_count;                    /* used for corking/uncorking connections */
        struct ev_entry *event;                 /* used for associated events */
 
-       struct PrivilegeSet *privset;           /* privset... */
-
        char sasl_agent[IDLEN];
        unsigned char sasl_out;
        unsigned char sasl_complete;
@@ -439,6 +436,7 @@ struct ListClient
 #define LFLAGS_FLUSH           0x00000002
 #define LFLAGS_CORK            0x00000004
 #define LFLAGS_SCTP            0x00000008
+#define LFLAGS_INSECURE        0x00000010      /* for marking SSL clients as insecure before registration */
 
 /* umodes, settable flags */
 /* lots of this moved to snomask -- jilles */
@@ -451,7 +449,6 @@ struct ListClient
 #define UMODE_SERVICE      0x0040
 #define UMODE_DEAF        0x0080
 #define UMODE_NOFORWARD    0x0100      /* don't forward */
-#define UMODE_REGONLYMSG   0x0200      /* only allow logged in users to msg */
 
 /* user information flags, only settable by remote mode or local oper */
 #define UMODE_OPER         0x1000      /* Operator */
@@ -513,6 +510,10 @@ struct ListClient
 #define SetSCTP(x)             ((x)->localClient->localflags |= LFLAGS_SCTP)
 #define ClearSCTP(x)           ((x)->localClient->localflags &= ~LFLAGS_SCTP)
 
+#define IsInsecure(x)          ((x)->localClient->localflags & LFLAGS_INSECURE)
+#define SetInsecure(x)         ((x)->localClient->localflags |= LFLAGS_INSECURE)
+#define ClearInsecure(x)       ((x)->localClient->localflags &= ~LFLAGS_INSECURE)
+
 /* oper flags */
 #define MyOper(x)               (MyConnect(x) && IsOper(x))
 
@@ -538,7 +539,6 @@ struct ListClient
 #define IsService(x)           ((x)->umodes & UMODE_SERVICE)
 #define IsDeaf(x)              ((x)->umodes & UMODE_DEAF)
 #define IsNoForward(x)         ((x)->umodes & UMODE_NOFORWARD)
-#define IsSetRegOnlyMsg(x)     ((x)->umodes & UMODE_REGONLYMSG)
 
 #define SetGotId(x)             ((x)->flags |= FLAGS_GOTID)
 #define IsGotId(x)              (((x)->flags & FLAGS_GOTID) != 0)