This version seems to implement almost all correctly, more testing

[moira.git] / include / moira_site.h

diff --git a/include/moira_site.h b/include/moira_site.h
index 7975e1f5e369cb129bb31019fe1ff16a5778f2ba..e28a673b0c4d16951ffc7d7951836357f9418f55 100644 (file)
--- a/include/moira_site.h
+++ b/include/moira_site.h
@@ -32,6 +32,14 @@
 
 #include "mit-copyright.h"
 
+#define NAME 0
+
+/* get_ace_use */
+
+#define ACE_TYPE 0
+#define ACE_NAME 1
+#define ACE_END  2
+
 /* alias queries. */
 
 #define ALIAS_NAME  0
@@ -100,11 +108,11 @@
 #define L_MAILLIST 4
 #define L_GROUP    5
 #define L_GID      6
-#define L_ACL_TYPE 7
-#define L_ACL_NAME 8
+#define L_ACE_TYPE 7
+#define L_ACE_NAME 8
 #define L_DESC     9
 #define L_MODTIME  10
-#define L_MODBY   11
+#define L_MODBY    11
 #define L_MODWITH  12
 #define L_END      13
 
@@ -147,9 +155,8 @@
 
 #define PO_NAME    0
 #define PO_TYPE    1
-#define PO_MACHINE 2
-#define PO_BOX     3
-#define PO_END     4
+#define PO_BOX     2
+#define PO_END     3
 
 /* Quota queries */
 
@@ -166,19 +173,18 @@
 /* User Information queries */
 
 #define U_NAME    0
-#define U_NEWNAME 1
-#define U_UID     2
-#define U_SHELL   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_MODTIME 10
-#define U_MODBY   11
-#define U_MODWITH 12
-#define U_END     13
+#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_MODTIME 9
+#define U_MODBY   10
+#define U_MODWITH 11
+#define U_END     12
 
 #endif _infodefs_              /* Do not add anything after this line. */