fix makefile bug

[moira.git] / include / moira_site.h

diff --git a/include/moira_site.h b/include/moira_site.h
index c24645e9195e3769d5276450a8c8a33aa1039fe9..767593d166c5cb5411ff96dc3ae29dae21b49f86 100644 (file)
--- a/include/moira_site.h
+++ b/include/moira_site.h
@@ -1,23 +1,19 @@
-/*
- * This file contains all definitions that allow easy access to 
+/* $Id$
+ *
+ * This file contains all definitions that allow easy access to
  * elements returned by most of the @i[Moira] queries.  It also defines
  * the default server location and the directories used on the server.
  *
  * If the order of the arguments in the @i[Moira] queries change (again)
- * then all that needs to be changed are the values of these items 
+ * then all that needs to be changed are the values of these items
  * and all should be well, (hopefully :-).
  *
  *                                 Chris D. Peterson - kit@athena
  *                                   7/27/88
  *
- *      $Source$
- *      $Author$
- *      $Header$
- *     
- *     Copyright 1988 by the Massachusetts Institute of Technology.
- *
- *     For further information on copyright and distribution 
- *     see the file mit-copyright.h
+ * Copyright (C) 1988-1998 by the Massachusetts Institute of Technology.
+ * For further information on copyright and distribution
+ * see the file <mit-copyright.h>.
  */
 
 #ifndef _moira_site_
@@ -26,7 +22,7 @@
 #include "mit-copyright.h"
 
 /* Default Moira server to connect to */
-#define MOIRA_SERVER   "MOIRA.MIT.EDU:sms_db"
+#define MOIRA_SERVER   "MOIRA.MIT.EDU:moira_db"
 
 
 #define NAME 0
@@ -144,12 +140,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 */
 
@@ -207,7 +220,7 @@
 #define Q_FILESYS   0
 #define Q_TYPE      1
 #define Q_NAME      2
-#define Q_QUOTA     3  
+#define Q_QUOTA     3
 #define Q_DIRECTORY 4
 #define Q_MACHINE   5
 #define Q_MODTIME   6
@@ -277,6 +290,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
@@ -285,15 +314,16 @@
 #define U_LAST    3
 #define U_FIRST   4
 #define U_MIDDLE  5
-#define U_STATE   6  
+#define U_STATE   6
 #define U_MITID   7
 #define U_CLASS   8
 #define U_COMMENT 9
 #define U_SIGNATURE 10
-#define U_MODTIME 11
-#define U_MODBY   12
-#define U_MODWITH 13
-#define U_END     14
+#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) */
 
@@ -313,6 +343,11 @@
 #define USH_SHELL       1
 #define USH_END         2
 
+/* MITdir pref bits */
+
+#define DIRFLAGS_SUPPRESS 1
+#define DIRFLAGS_NONLOCAL 2
+
 /* Zehpyr ACL queries */
 
 #define ZA_CLASS       0
@@ -333,7 +368,7 @@
 
 /* Directories & files used on the server machine: */
 
-#define SMS_DIR                "/moira"        /* home directory of the system */
+#define MOIRA_DIR      "/moira"        /* home directory of the system */
 #define BIN_DIR                "/moira/bin"    /* where progs live */
 #define DCM_DIR                "/moira/dcm"    /* where DCM output files end up */
 #define LOCK_DIR       "/moira/dcm/locks" /* where DCM puts lock files */