--- sourceforge.net/trunk/rdesktop/constants.h	2002/07/27 22:35:38	69
+++ sourceforge.net/trunk/rdesktop/constants.h	2003/05/05 12:20:53	371
@@ -1,7 +1,7 @@
 /*
    rdesktop: A Remote Desktop Protocol client.
    Miscellaneous protocol constants
-   Copyright (C) Matthew Chapman 1999-2000
+   Copyright (C) Matthew Chapman 1999-2002
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -72,6 +72,8 @@
 
 #define SEC_TAG_CLI_INFO	0xc001
 #define SEC_TAG_CLI_CRYPT	0xc002
+#define SEC_TAG_CLI_4           0xc004
+#define SEC_TAG_CLI_CHANNELS    0xc003
 
 #define SEC_TAG_PUBKEY		0x0006
 #define SEC_TAG_KEYSIG		0x0008
@@ -83,14 +85,14 @@
 #define LICENCE_HWID_SIZE	20
 #define LICENCE_SIGNATURE_SIZE	16
 
-#define LICENCE_TAG_DEMAND	0x0201
-#define LICENCE_TAG_AUTHREQ	0x0202
-#define LICENCE_TAG_ISSUE	0x0203
-#define LICENCE_TAG_REISSUE	0x0204
-#define LICENCE_TAG_PRESENT	0x0212
-#define LICENCE_TAG_REQUEST	0x0213
-#define LICENCE_TAG_AUTHRESP	0x0215
-#define LICENCE_TAG_RESULT	0x02ff
+#define LICENCE_TAG_DEMAND	0x01
+#define LICENCE_TAG_AUTHREQ	0x02
+#define LICENCE_TAG_ISSUE	0x03
+#define LICENCE_TAG_REISSUE	0x04
+#define LICENCE_TAG_PRESENT	0x12
+#define LICENCE_TAG_REQUEST	0x13
+#define LICENCE_TAG_AUTHRESP	0x15
+#define LICENCE_TAG_RESULT	0xff
 
 #define LICENCE_TAG_USER	0x000f
 #define LICENCE_TAG_HOST	0x0010
@@ -189,7 +191,7 @@
 #define TEXT2_IMPLICIT_X	0x20
 
 /* RDP capabilities */
-#define RDP_CAPSET_GENERAL	1
+#define RDP_CAPSET_GENERAL	1	/* Maps to generalCapabilitySet in T.128 page 138 */
 #define RDP_CAPLEN_GENERAL	0x18
 #define OS_MAJOR_TYPE_UNIX	4
 #define OS_MINOR_TYPE_XSERVER	7
@@ -228,6 +230,7 @@
 /* Logon flags */
 #define RDP_LOGON_NORMAL	0x33
 #define RDP_LOGON_AUTO		0x8
+#define RDP_LOGON_BLOB		0x100
 
 /* Keymap flags */
 #define MapRightShiftMask   (1<<0)
@@ -251,6 +254,8 @@
 
 #define MapLocalStateMask   (1<<10)
 
+#define MapInhibitMask      (1<<11)
+
 #define MASK_ADD_BITS(var, mask) (var |= mask)
 #define MASK_REMOVE_BITS(var, mask) (var &= ~mask)
 #define MASK_HAS_BITS(var, mask) ((var & mask)>0)