X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fclient.h;h=4185d2176ebd2e4ba7a65391f254c03cfe76a808;hb=e954b59d414fb32b89291514d0d690c9ebabba49;hp=71d413b2f01be419f8c72c997cb33ca620e01a7e;hpb=44698e44e8a9bf9f3a1211e10b4d59e00be5864f;p=ngircd-alex.git

diff --git a/src/ngircd/client.h b/src/ngircd/client.h
index 71d413b2..4185d217 100644
--- a/src/ngircd/client.h
+++ b/src/ngircd/client.h
@@ -17,19 +17,20 @@
  * Client management (header)
  */
 
-#define CLIENT_UNKNOWN 1		/* connection of unknown type */
-#define CLIENT_GOTPASS 2		/* client did send PASS */
-#define CLIENT_GOTNICK 4		/* client did send NICK */
-#define CLIENT_GOTUSER 8		/* client did send USER */
-#define CLIENT_USER 16			/* client is an IRC user */
-#define CLIENT_SERVER 32		/* client is a server */
-#define CLIENT_SERVICE 64		/* client is a service */
-#define CLIENT_UNKNOWNSERVER 128	/* unregistered server connection */
-#define CLIENT_GOTPASS_2813 256		/* client did send PASS, RFC 2813 style */
+#define CLIENT_UNKNOWN		0x0001	/* connection of unknown type */
+#define CLIENT_GOTPASS		0x0002	/* client did send PASS */
+#define CLIENT_GOTNICK		0x0004	/* client did send NICK */
+#define CLIENT_GOTUSER		0x0008	/* client did send USER */
+#define CLIENT_USER		0x0010	/* client is an IRC user */
+#define CLIENT_SERVER		0x0020	/* client is a server */
+#define CLIENT_SERVICE		0x0040	/* client is a service */
+#define CLIENT_UNKNOWNSERVER	0x0080	/* unregistered server connection */
+#define CLIENT_GOTPASS_2813	0x0100	/* client did send PASS, RFC 2813 style */
 #ifndef STRICT_RFC
-# define CLIENT_WAITAUTHPING 512	/* waiting for AUTH PONG from client */
+# define CLIENT_WAITAUTHPING	0x0200	/* waiting for AUTH PONG from client */
 #endif
-#define CLIENT_WAITCAPEND 1024		/* waiting for "CAP END" command */
+#define CLIENT_WAITCAPEND	0x0400	/* waiting for "CAP END" command */
+#define CLIENT_ANY		0xFFFF
 
 #define CLIENT_TYPE int
 
@@ -51,14 +52,14 @@ typedef struct _CLIENT
 	char *cloaked;			/* cloaked hostname of the client */
 	char *ipa_text;			/* textual representaton of IP address */
 	char user[CLIENT_USER_LEN];	/* user name ("login") */
-#if defined(PAM) && defined(IDENTAUTH)
-	char orig_user[CLIENT_USER_LEN];/* user name supplied by USER command */
+#if defined(PAM)
+	char orig_user[CLIENT_AUTHUSER_LEN];
+					/* original user name supplied by USER command */
 #endif
 	char info[CLIENT_INFO_LEN];	/* long user name (user) / info text (server) */
 	char modes[CLIENT_MODE_LEN];	/* client modes */
 	int hops, token, mytoken;	/* "hops" and "Token" (see SERVER command) */
-	bool oper_by_me;		/* client is local IRC operator on this server? */
-	char away[CLIENT_AWAY_LEN];	/* AWAY text (valid if mode 'a' is set) */
+	char *away;			/* AWAY text (valid if mode 'a' is set) */
 	char flags[CLIENT_FLAGS_LEN];	/* flags of the client */
 	char *account_name;		/* login account (for services) */
 	int capabilities;		/* enabled IRC capabilities */
@@ -119,7 +120,6 @@ GLOBAL const char *Client_IPAText PARAMS(( CLIENT *Client ));
 GLOBAL char *Client_Modes PARAMS(( CLIENT *Client ));
 GLOBAL char *Client_Flags PARAMS(( CLIENT *Client ));
 GLOBAL CLIENT *Client_Introducer PARAMS(( CLIENT *Client ));
-GLOBAL bool Client_OperByMe PARAMS(( CLIENT *Client ));
 GLOBAL int Client_Hops PARAMS(( CLIENT *Client ));
 GLOBAL int Client_Token PARAMS(( CLIENT *Client ));
 GLOBAL int Client_MyToken PARAMS(( CLIENT *Client ));
@@ -141,7 +141,6 @@ GLOBAL void Client_SetInfo PARAMS(( CLIENT *Client, const char *Info ));
 GLOBAL void Client_SetType PARAMS(( CLIENT *Client, int Type ));
 GLOBAL void Client_SetHops PARAMS(( CLIENT *Client, int Hops ));
 GLOBAL void Client_SetToken PARAMS(( CLIENT *Client, int Token ));
-GLOBAL void Client_SetOperByMe PARAMS(( CLIENT *Client, bool OperByMe ));
 GLOBAL void Client_SetModes PARAMS(( CLIENT *Client, const char *Modes ));
 GLOBAL void Client_SetFlags PARAMS(( CLIENT *Client, const char *Flags ));
 GLOBAL void Client_SetIntroducer PARAMS(( CLIENT *Client, CLIENT *Introducer ));