Merge pull request #285 from edk0/ratelimits

[solanum.git] / include / client.h

diff --git a/include/client.h b/include/client.h
index 9ded2c87df29ac5e0259485a6117759e0a23e784..ccc3c2e9492b0ce52b348fe40e3e5fba86d1cf03 100644 (file)
--- a/include/client.h
+++ b/include/client.h
@@ -79,6 +79,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 +228,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 +284,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;