X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/3cf0c9dad61e0f5af3f709a4de577c368e473283..fdc7c581b8ee50b545b355dbad12046702a96cd4:/include/moira_site.h

diff --git a/include/moira_site.h b/include/moira_site.h
index 0cec2e23..e954ad2f 100644
--- a/include/moira_site.h
+++ b/include/moira_site.h
@@ -33,7 +33,18 @@
 #define ACE_NAME 1
 #define ACE_END  2
 
-/* alias queries. */
+/* acl queries */
+
+#define ACL_HOST    0
+#define ACL_TARGET  1
+#define ACL_KIND    2
+#define ACL_LIST    3
+#define ACL_MODTIME 4
+#define ACL_MODBY   5
+#define ACL_MODWITH 6
+#define ACL_END     7
+
+/* alias queries */
 
 #define ALIAS_NAME  0
 #define ALIAS_TYPE  1
@@ -114,7 +125,7 @@
 #define KMAP_PRINCIPAL	1
 #define KMAP_END	2
 
-/* General List information Queries. */
+/* General List information Queries, v4. */
 
 #define L_NAME     0
 #define L_ACTIVE   1
@@ -123,13 +134,16 @@
 #define L_MAILLIST 4
 #define L_GROUP    5
 #define L_GID      6
-#define L_ACE_TYPE 7
-#define L_ACE_NAME 8
-#define L_DESC     9
-#define L_MODTIME  10
-#define L_MODBY    11
-#define L_MODWITH  12
-#define L_END      13
+#define L_NFSGROUP 7
+#define L_ACE_TYPE 8
+#define L_ACE_NAME 9
+#define L_MEMACE_TYPE 10
+#define L_MEMACE_NAME 11
+#define L_DESC     12
+#define L_MODTIME  13
+#define L_MODBY    14
+#define L_MODWITH  15
+#define L_END      16
 
 /* List Member information queries. */
 
@@ -138,6 +152,9 @@
 #define LM_MEMBER 2
 #define LM_END    3
 
+#define LM_TAG     3
+#define LM_TAG_END 4
+
 /* Machine information queries */
 
 #define M_NAME		0
@@ -147,22 +164,24 @@
 #define M_OS		3
 #define M_LOC		4
 #define M_CONTACT	5
-#define M_USE		6
-#define M_STAT		7
-#define M_STAT_CHNG	8
-#define M_SUBNET	9
-#define M_ADDR		10
-#define M_OWNER_TYPE	11
-#define M_OWNER_NAME	12
-#define M_ACOMMENT	13
-#define M_OCOMMENT	14
-#define M_CREATED	15
-#define M_CREATOR	16
-#define M_INUSE		17
-#define M_MODTIME	18
-#define M_MODBY		19
-#define M_MODWITH	20
-#define M_END		21
+#define M_BILL_CONTACT  6
+#define M_ACCT_NUMBER   7
+#define M_USE		8
+#define M_STAT		9
+#define M_STAT_CHNG	10
+#define M_SUBNET	11
+#define M_ADDR		12
+#define M_OWNER_TYPE	13
+#define M_OWNER_NAME	14
+#define M_ACOMMENT	15
+#define M_OCOMMENT	16
+#define M_CREATED	17
+#define M_CREATOR	18
+#define M_INUSE		19
+#define M_MODTIME	20
+#define M_MODBY		21
+#define M_MODWITH	22
+#define M_END		23
 
 /*  Machine to Cluster mapping */
 
@@ -228,7 +247,8 @@
 #define PO_NAME    0
 #define PO_TYPE    1
 #define PO_BOX     2
-#define PO_END     3
+#define PO_ADDR    3
+#define PO_END     4
 
 /* Quota queries */
 
@@ -309,48 +329,67 @@
 
 #define SN_NAME		0
 #define SN_DESC		1
-#define SN_ADDRESS	2
-#define SN_MASK		3
-#define SN_LOW		4
-#define SN_HIGH		5
-#define SN_PREFIX	6
-#define SN_ACE_TYPE	7
-#define SN_ACE_NAME	8
-#define SN_MODTIME	9
-#define SN_MODBY	10
-#define SN_MODWITH	11
-#define SN_END		12
-
-/* User Information queries */
+#define SN_STATUS       2
+#define SN_CONTACT      3
+#define SN_ACCT_NUMBER  4
+#define SN_ADDRESS	5
+#define SN_MASK		6
+#define SN_LOW		7
+#define SN_HIGH		8
+#define SN_PREFIX	9
+#define SN_ACE_TYPE	10
+#define SN_ACE_NAME	11
+#define SN_MODTIME	12
+#define SN_MODBY	13
+#define SN_MODWITH	14
+#define SN_END		15
+
+/* Subnet statuses */
+#define SNET_STATUS_RESERVED         0
+#define SNET_STATUS_BILLABLE         1
+#define SNET_STATUS_PRIVATE_10MBPS   2
+#define SNET_STATUS_PRIVATE_100MBPS  3
+#define SNET_STATUS_PRIVATE_OTHER    4
+#define SNET_STATUS_RESNET_DORM      5
+#define SNET_STATUS_INFRASTRUCTURE   6
+#define SNET_STATUS_PRIVATE_1000MBPS 7
+#define SNET_STATUS_RESNET_FSILG     8
+
+/* User Information queries, v3 */
 
 #define U_NAME    0
 #define U_UID     1
 #define U_SHELL   2
-#define U_LAST    3
-#define U_FIRST   4
-#define U_MIDDLE  5
-#define U_STATE   6
-#define U_MITID   7
-#define U_CLASS   8
-#define U_COMMENT 9
-#define U_SIGNATURE 10
-#define U_SECURE  11
-#define U_MODTIME 12
-#define U_MODBY   13
-#define U_MODWITH 14
-#define U_END     15
+#define U_WINCONSOLESHELL 3
+#define U_LAST    4
+#define U_FIRST   5
+#define U_MIDDLE  6
+#define U_STATE   7
+#define U_MITID   8
+#define U_CLASS   9
+#define U_COMMENT 10
+#define U_SIGNATURE 11
+#define U_SECURE  12
+#define U_MODTIME 13
+#define U_MODBY   14
+#define U_MODWITH 15
+#define U_CREATED 16
+#define U_CREATOR 17
+#define U_END     18
 
 /* User states (the value of argv[U_STATE] from a user query) */
 
-#define US_NO_LOGIN_YET 0
-#define US_REGISTERED   1
-#define US_NO_PASSWD    2
-#define US_DELETED      3
-#define US_NOT_ALLOWED  4
-#define US_ENROLLED	5
-#define US_ENROLL_NOT_ALLOWED 6
-#define US_HALF_ENROLLED 7
-#define US_END          8
+#define US_NO_LOGIN_YET               0
+#define US_REGISTERED                 1
+#define US_NO_PASSWD                  2
+#define US_DELETED                    3
+#define US_NOT_ALLOWED                4
+#define US_ENROLLED                   5
+#define US_ENROLL_NOT_ALLOWED         6
+#define US_HALF_ENROLLED              7
+#define US_NO_LOGIN_YET_KERBEROS_ONLY 8
+#define US_REGISTERED_KERBEROS_ONLY   9
+#define US_END                       10
 
 /* User shell queries */
 
@@ -358,12 +397,7 @@
 #define USH_SHELL       1
 #define USH_END         2
 
-/* MITdir pref bits */
-
-#define DIRFLAGS_SUPPRESS 1
-#define DIRFLAGS_NONLOCAL 2
-
-/* Zehpyr ACL queries */
+/* Zephyr ACL queries */
 
 #define ZA_CLASS	0
 #define ZA_XMT_TYPE	1
@@ -374,12 +408,27 @@
 #define	ZA_IWS_ID	6
 #define	ZA_IUI_TYPE	7
 #define	ZA_IUI_ID	8
-#define	ZA_MODTIME 	9
-#define	ZA_MODBY	10
-#define	ZA_MODWITH	11
-#define ZA_END		12
-
-
+#define ZA_OWNER_TYPE   9
+#define ZA_OWNER_ID     10
+#define	ZA_MODTIME 	11
+#define	ZA_MODBY	12
+#define	ZA_MODWITH	13
+#define ZA_END		14
+
+/* Container queries */
+
+#define CON_NAME        0
+#define CON_DESCRIPT    1
+#define CON_LOCATION    2
+#define CON_CONTACT     3
+#define CON_OWNER_TYPE  4
+#define CON_OWNER_NAME  5
+#define CON_MEMACE_TYPE 6
+#define CON_MEMACE_NAME 7
+#define CON_MODTIME     8
+#define CON_MODBY       9
+#define CON_MODWITH     10
+#define CON_END         11
 
 /* Directories & files used on the server machine: */