Update patchlevel for 2.10.12.04 release.

[ircu2.10.12-pk.git] / include / client.h

diff --git a/include/client.h b/include/client.h
index 42881b140efc14d36bc42446e5ad42cbcbac22b7..6e23e42361433855c1778b5e6f1fd49d01bb6920 100644 (file)
--- a/include/client.h
+++ b/include/client.h
@@ -89,7 +89,7 @@ typedef unsigned long flagpage_t;
 /** Clear a flag in a flagset. */
 #define FlagClr(set,flag) ((set)->bits[FLAGSET_INDEX(flag)] &= ~FLAGSET_MASK(flag))
 
-/** String containig valid user modes, in no particular order. */
+/** String containing valid user modes, in no particular order. */
 #define infousermodes "dioswkgx"
 
 /** Operator privileges. */
@@ -125,6 +125,7 @@ enum Priv
     PRIV_LIST_CHAN, /**< oper can list secret channels */
     PRIV_FORCE_OPMODE, /**< can hack modes on quarantined channels */
     PRIV_FORCE_LOCAL_OPMODE, /**< can hack modes on quarantined local channels */
+    PRIV_APASS_OPMODE, /**< can hack modes +A/-A/+U/-U */
     PRIV_LAST_PRIV /**< number of privileges */
   };
 
@@ -209,8 +210,6 @@ struct Connection
   struct SLink*       con_confs;     /**< Associated configuration records. */
   HandlerType         con_handler;   /**< Message index into command table
                                         for parsing. */
-  struct DNSReply*    con_dns_reply; /**< DNS reply received during client
-                                       registration. */
   struct ListingArgs* con_listing;   /**< Current LIST status. */
   unsigned long       con_unreg;     /**< Indicate what still needs to be done */
   unsigned int        con_max_sendq; /**< cached max send queue for client */
@@ -232,8 +231,8 @@ struct Connection
   struct Timer        con_proc;      /**< process latent messages from
                                       client */
   struct Privs        con_privs;     /**< Oper privileges */
-  struct CapSet       con_capab;     /**< Client capabilities */
-  struct CapSet       con_active;    /**< Active client capabilities */
+  struct CapSet       con_capab;     /**< Client capabilities (from us) */
+  struct CapSet       con_active;    /**< Active capabilities (to us) */
   struct AuthRequest* con_auth;      /**< auth request for client */
   struct IAuthRequest* con_iauth;    /**< iauth request for client */
 };
@@ -261,7 +260,7 @@ struct Client {
   struct irc_in_addr cli_ip;      /**< Real IP of client */
   short          cli_status;      /**< Client type */
   char cli_name[HOSTLEN + 1];     /**< Unique name of the client, nick or host */
-  char cli_username[USERLEN + 1]; /**< username here now for auth stuff */
+  char cli_username[USERLEN + 1]; /**< Username determined by ident lookup */
   char cli_info[REALLEN + 1];     /**< Free form additional client information */
 };
 
@@ -366,8 +365,6 @@ struct Client {
 #define cli_confs(cli)         con_confs(cli_connect(cli))
 /** Get handler type for client. */
 #define cli_handler(cli)       con_handler(cli_connect(cli))
-/** Get DNS reply for client. */
-#define cli_dns_reply(cli)     con_dns_reply(cli_connect(cli))
 /** Get LIST status for client. */
 #define cli_listing(cli)       con_listing(cli_connect(cli))
 /** Get cached max SendQ for client. */
@@ -447,8 +444,6 @@ struct Client {
 #define con_confs(con)         ((con)->con_confs)
 /** Get command handler for the connection. */
 #define con_handler(con)       ((con)->con_handler)
-/** Get DNS reply for the connection. */
-#define con_dns_reply(con)     ((con)->con_dns_reply)
 /** Get the LIST status for the connection. */
 #define con_listing(con)       ((con)->con_listing)
 /** Get remining steps before registration completes. */