Allow hostname to start with a digit in hostname_check, but disallow it

[moira.git] / server / query.h

diff --git a/server/query.h b/server/query.h
index ee5c05afc9b3ca976e8c086877a629c506d744ef..8b5d88c02832f3db621bd66ed3ed57f486bfb48f 100644 (file)
--- a/server/query.h
+++ b/server/query.h
@@ -10,15 +10,6 @@
 /* Query Types */
 enum query_type {RETRIEVE, UPDATE, APPEND, DELETE, SPECIAL};
 
-/* Tables */
-enum tables {NO_TABLE, USERS_TABLE, KRBMAP_TABLE, MACHINE_TABLE,
-            HOSTALIAS_TABLE, SUBNET_TABLE, CLUSTER_TABLE, MCMAP_TABLE,
-            SVC_TABLE, LIST_TABLE, IMEMBERS_TABLE, SERVERS_TABLE,
-            SERVERHOSTS_TABLE, FILESYS_TABLE, FSGROUP_TABLE, NFSPHYS_TABLE,
-            QUOTA_TABLE, ZEPHYR_TABLE, HOSTACCESS_TABLE, STRINGS_TABLE,
-            SERVICES_TABLE, PRINTCAP_TABLE, PALLADIUM_TABLE, CAPACLS_TABLE,
-            ALIAS_TABLE, NUMVALUES_TABLE, TBLSTATS_TABLE, INCREMENTAL_TABLE};
-
 /* Query Definition Structure */
 struct query
 {
@@ -32,6 +23,7 @@ struct query
   int  vcnt;                   /* variable count */
   char *qual;                  /* format string for "where" clause */
   int  argc;                   /* number of args for qualifier */
+  char *sort;                  /* fields to sort on */
   struct validate *validate;   /* validation support */
   int  acl;                    /* hint as to query ACL for this query */
   int  everybody;              /* is the default user on this ACL? */
@@ -58,9 +50,8 @@ struct validate
 };
 
 /* Validated Object Types */
-enum vo_type {V_NAME, V_ID, V_TYPE, V_TYPEDATA,
-             V_SORT, V_RENAME, V_CHAR, V_LOCK, V_WILD, V_UPWILD,
-              V_RLOCK, V_LEN};
+enum vo_type {V_NAME, V_ID, V_TYPE, V_TYPEDATA, V_RENAME, V_CHAR,
+             V_LEN, V_NUM};
 
 /* Validated Object Definition */
 struct valobj