X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/ef073d27a9803a3c5b5a5efb6272196c0e058354..refs/heads/LOCKING:/include/moira_site.h

diff --git a/include/moira_site.h b/include/moira_site.h
index 9912cfe5..2575cf2c 100644
--- a/include/moira_site.h
+++ b/include/moira_site.h
@@ -28,18 +28,6 @@
 /* Default Moira server to connect to */
 #define MOIRA_SERVER	"MOIRA.MIT.EDU:sms_db"
 
-/* Compile-time options: */
-/*   used hesiod looking up Moira server name */
-#define HESIOD
-/*   log errors via zephyr */
-#define ZEPHYR
-/*   log errors via syslog */
-/* #define SYSLOG */
-/*   Athena local hacks -- other sites probably don't want this */
-#define ATHENA
-/* Ingres version number */
-#define INGRESVER 5
-
 
 #define NAME 0
 
@@ -156,12 +144,29 @@
 
 /* Machine information queries */
 
-#define M_NAME       0
-#define M_TYPE       1
-#define M_MODTIME    2
-#define M_MODBY      3
-#define M_MODWITH    4
-#define M_END        5
+#define M_NAME		0
+#define M_VENDOR	1
+#define M_TYPE		1
+#define M_MODEL		2
+#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
 
 /*  Machine to Cluster mapping */
 
@@ -289,6 +294,22 @@
 #define SHI_VALUE3	5
 #define SHI_END		6
 
+/* Subnet info */
+
+#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 U_NAME    0
@@ -300,10 +321,13 @@
 #define U_STATE   6  
 #define U_MITID   7
 #define U_CLASS   8
-#define U_MODTIME 9
-#define U_MODBY   10
-#define U_MODWITH 11
-#define U_END     12
+#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
 
 /* User states (the value of argv[U_STATE] from a user query) */
 
@@ -355,4 +379,4 @@
 #define MOIRA_MOTD_FILE	"/etc/smsdown"	/* make the server go to sleep */
 
 
-#endif _moira_site_		/* Do not add anything after this line. */
+#endif /* _moira_site_ */	     /* Do not add anything after this line. */