remove the (unused) table locking code

diff --git a/server/queries2.c b/server/queries2.c
index 75865f4c9bc1603a49b61d4278b5d65571998960..7679a42f0fb103d99b5349f6fb3f36b5b3ddbedd 100644 (file)
--- a/server/queries2.c
+++ b/server/queries2.c
@@ -18,14 +18,6 @@
  * can be shared.
  */
 
-/*
- * A word about validation objects and locking:  The validation object
- * for a query should also request locks on behalf of the pre-processing
- * and post-processing routines.  This helps to ensure that tables are
- * accessed and locked in the proper order and thus avoids deadlock
- * situations
- */
-
 static struct valobj VOwild0[] = {
   {V_WILD, 0},
 };
@@ -58,10 +50,18 @@ static struct valobj VOclu0[] = {
   {V_ID, 0, CLUSTERS_TABLE, "name", "clu_id", MR_CLUSTER},
 };
 
+static struct valobj VOsnet0[] = {
+  {V_ID, 0, SUBNET_TABLE, "name", "snet_id", MR_SUBNET},
+};
+
 static struct valobj VOlist0[] = {
   {V_ID, 0, LIST_TABLE, "name", "list_id", MR_LIST},
 };
 
+static struct valobj VOfilesys0[] = {
+  {V_ID, 0, FILESYS_TABLE, "label", "filsys_id", MR_FILESYS},
+};
+
 static struct valobj VOnum0[] = {
   {V_NUM, 0},
 };
@@ -253,7 +253,6 @@ static char *auac_fields[] = {
 };
 
 static struct valobj auac_valobj[] = {
-  {V_LOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
   {V_CHAR, 0, USERS_TABLE, "login"},
   {V_NUM, 1},
   {V_CHAR, 2, USERS_TABLE, "shell"},
@@ -269,7 +268,7 @@ static struct valobj auac_valobj[] = {
 
 static struct validate auac_validate = {
   auac_valobj,
-  12,
+  11,
   "login",
   "login = '%s'",
   1,
@@ -281,7 +280,7 @@ static struct validate auac_validate = {
 
 static struct validate ausr_validate = {
   auac_valobj,
-  10,
+  9,
   "login",
   "login = '%s'",
   1,
@@ -296,14 +295,6 @@ static char *rusr_fields[] = {
 };
 
 static struct valobj rusr_valobj[] = {
-  {V_LOCK, 0, IMEMBERS_TABLE, 0, "list_id", MR_DEADLOCK},
-  {V_LOCK, 0, FILESYS_TABLE, 0, "filsys_id", MR_DEADLOCK},
-  {V_LOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_RLOCK, 0, MACHINE_TABLE, 0, "mach_id", MR_DEADLOCK},
-  {V_LOCK, 0, LIST_TABLE, 0, "list_id", MR_DEADLOCK},
-  {V_LOCK, 0, NFSPHYS_TABLE, 0, "nfsphys_id", MR_DEADLOCK},
-  {V_LOCK, 0, QUOTA_TABLE, 0, "filsys_id", MR_DEADLOCK},
-  {V_RLOCK, 0, SERVERHOSTS_TABLE, 0, "mach_id", MR_DEADLOCK},
   {V_NUM, 0},
   {V_CHAR, 1},
   {V_NUM, 2},
@@ -311,7 +302,7 @@ static struct valobj rusr_valobj[] = {
 
 static struct validate rusr_validate = {
   rusr_valobj,
-  11,
+  3,
   0,
   0,
   0,
@@ -328,7 +319,6 @@ static char *uuac_fields[] = {
 };
 
 static struct valobj uuac_valobj[] = {
-  {V_LOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
   {V_ID, 0, USERS_TABLE, "login", "users_id", MR_USER},
   {V_RENAME, 1, USERS_TABLE, "login", "users_id", MR_NOT_UNIQUE},
   {V_NUM, 2},
@@ -345,7 +335,7 @@ static struct valobj uuac_valobj[] = {
 
 static struct validate uuac_validate = {
   uuac_valobj,
-  13,
+  12,
   0,
   0,
   0,
@@ -357,7 +347,7 @@ static struct validate uuac_validate = {
 
 static struct validate uusr_validate = {
   uuac_valobj,
-  12,
+  11,
   0,
   0,
   0,
@@ -373,14 +363,13 @@ static char *uush_fields[] = {
 };
 
 static struct valobj uush_valobj[] = {
-  {V_LOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
   {V_ID, 0, USERS_TABLE, "login", "users_id", MR_USER},
   {V_CHAR, 1, USERS_TABLE, "shell"},
 };
 
 static struct validate uush_validate = {
   uush_valobj,
-  3,
+  2,
   0,
   0,
   0,
@@ -401,7 +390,6 @@ static char *uuss_fields[] = {
 };
 
 static struct valobj uust_valobj[] = {
-  {V_LOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
   {V_ID, 0, USERS_TABLE, "login", "users_id", MR_USER},
   {V_NUM, 1},
   {V_NUM, 2},
@@ -409,7 +397,7 @@ static struct valobj uust_valobj[] = {
 
 static struct validate uust_validate = {
   uust_valobj,
-  3,
+  2,
   0,
   0,
   0,
@@ -426,7 +414,7 @@ static char *uudf_fields[] = {
 
 static struct validate uudf_validate = {
   uust_valobj,
-  4,
+  3,
   0,
   0,
   0,
@@ -440,20 +428,9 @@ static char *dusr_fields[] = {
   "login",
 };
 
-struct valobj dusr_valobj[]= {
-  {V_LOCK, 0, IMEMBERS_TABLE, 0, "list_id", MR_DEADLOCK},
-  {V_LOCK, 0, FILESYS_TABLE, 0,  "filsys_id", MR_DEADLOCK},
-  {V_LOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_LOCK, 0, LIST_TABLE, 0, "list_id", MR_DEADLOCK},
-  {V_LOCK, 0, QUOTA_TABLE, 0, "filsys_id", MR_DEADLOCK},
-  {V_LOCK, 0, HOSTACCESS_TABLE, 0, "mach_id", MR_DEADLOCK},
-  {V_LOCK, 0, KRBMAP_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_ID, 0, USERS_TABLE, "login", "users_id", MR_USER},
-};
-
 static struct validate dusr_validate = {
-  dusr_valobj,
-  8,
+  VOuser0,
+  1,
   0,
   0,
   0,
@@ -468,13 +445,12 @@ static char *dubu_fields[] = {
 };
 
 static struct valobj dubu_valobj[] = {
-  {V_LOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
   {V_ID, 0, USERS_TABLE, "unix_uid", "users_id", MR_USER}
 };
 
 static struct validate dubu_validate = {
   dubu_valobj,
-  2,
+  1,
   0,
   0,
   0,
@@ -491,7 +467,6 @@ static char *akum_fields[] = { "login", "kerberos" };
 
 static struct valobj akum_valobj[] =
 {
-  {V_LOCK, 0, KRBMAP_TABLE, 0, "users_id", MR_DEADLOCK},
   {V_ID, 0, USERS_TABLE, "login", "users_id", MR_USER},
   {V_ID, 1, STRINGS_TABLE, "string", "string_id", MR_NO_MATCH},
 };
@@ -499,7 +474,7 @@ static struct valobj akum_valobj[] =
 static struct validate akum_validate =
 {
   akum_valobj,
-  3,
+  2,
   "users_id",
   "users_id = %d or string_id = %d",
   2,
@@ -512,7 +487,7 @@ static struct validate akum_validate =
 static struct validate dkum_validate =
 {
   akum_valobj,
-  3,
+  2,
   "users_id",
   "users_id = %d and string_id = %d",
   2,
@@ -549,7 +524,6 @@ static char *ufbl_fields[] = {
 };
 
 static struct valobj ufbl_valobj[] = {
-  {V_LOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
   {V_ID, 0, USERS_TABLE, "login", "users_id", MR_USER},
   {V_LEN, 1, USERS_TABLE, "fullname"},
   {V_LEN, 2, USERS_TABLE, "nickname"},
@@ -563,7 +537,7 @@ static struct valobj ufbl_valobj[] = {
 
 static struct validate ufbl_validate = {
   ufbl_valobj,
-  10,
+  9,
   0,
   0,
   0,
@@ -594,14 +568,9 @@ static char *gpox_fields[] = {
   "login", "type", "box",
 };
 
-struct valobj gpox_valobj[] = {
-  {V_RLOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_RLOCK, 0, MACHINE_TABLE, 0, "mach_id", MR_DEADLOCK}
-};
-
 static struct validate gpox_validate = {
-  gpox_valobj,
-  2,
+  0,
+  0,
   0,
   0,
   0,
@@ -616,8 +585,6 @@ static char *spob_fields[] = {
 };
 
 static struct valobj spob_valobj[] = {
-  {V_LOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_RLOCK, 0, MACHINE_TABLE, 0, "mach_id", MR_DEADLOCK},
   {V_ID, 0, USERS_TABLE, "login", "users_id", MR_USER},
   {V_TYPE, 1, 0, "pobox", 0, MR_TYPE},
 };
@@ -625,7 +592,7 @@ static struct valobj spob_valobj[] = {
 static struct validate spob_validate = /* SET_POBOX */
 {
   spob_valobj,
-  4,
+  2,
   0,
   0,
   0,
@@ -635,16 +602,10 @@ static struct validate spob_validate =    /* SET_POBOX */
   set_pobox,
 };
 
-struct valobj spop_valobj[] = {
-  {V_LOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_RLOCK, 0, MACHINE_TABLE, 0, "mach_id", MR_DEADLOCK},
-  {V_ID, 0, USERS_TABLE, "login", "users_id", MR_USER},
-};
-
 static struct validate spop_validate = /* SET_POBOX_POP */
 {
-  spop_valobj,
-  3,
+  VOuser0,
+  1,
   0,
   0,
   0,
@@ -656,8 +617,8 @@ static struct validate spop_validate =      /* SET_POBOX_POP */
 
 static struct validate dpob_validate = /* DELETE_POBOX */
 {
-  spop_valobj,
-  3,
+  VOuser0,
+  1,
   0,
   0,
   0,
@@ -701,11 +662,6 @@ static char *ahst_fields[] = {
 };
 
 static struct valobj ahst_valobj[] = {
-  {V_RLOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_LOCK, 0, MACHINE_TABLE, 0, "mach_id", MR_DEADLOCK},
-  {V_RLOCK, 0, SUBNET_TABLE, 0, "snet_id", MR_DEADLOCK},
-  {V_RLOCK, 0, LIST_TABLE, 0, "list_id", MR_DEADLOCK},
-  {V_RLOCK, 0, HOSTALIAS_TABLE, 0, "mach_id", MR_DEADLOCK},
   {V_CHAR, 0, MACHINE_TABLE, "name"},
   {V_CHAR, 1, MACHINE_TABLE, "vendor"},
   {V_CHAR, 2, MACHINE_TABLE, "model"},
@@ -723,7 +679,7 @@ static struct valobj ahst_valobj[] = {
 
 static struct validate ahst_validate = {
   ahst_valobj,
-  18,
+  13,
   "name",
   "name = UPPER('%s')",
   1,
@@ -739,10 +695,6 @@ static char *uhst_fields[] = {
 };
 
 static struct valobj uhst_valobj[] = {
-  {V_RLOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_LOCK, 0, MACHINE_TABLE, 0, "mach_id", MR_DEADLOCK},
-  {V_RLOCK, 0, SUBNET_TABLE, 0, "snet_id", MR_DEADLOCK},
-  {V_RLOCK, 0, LIST_TABLE, 0, "list_id", MR_DEADLOCK},
   {V_CHAR, 0, MACHINE_TABLE, "name"},
   {V_ID, 0, MACHINE_TABLE, "name", "mach_id", MR_MACHINE},
   {V_RENAME, 1, MACHINE_TABLE, "name", "mach_id", MR_NOT_UNIQUE},
@@ -762,7 +714,7 @@ static struct valobj uhst_valobj[] = {
 
 static struct validate uhst_validate = {
   uhst_valobj,
-  19,
+  15,
   0,
   0,
   0,
@@ -776,22 +728,9 @@ static char *dhst_fields[] = {
   "name",
 };
 
-static struct valobj dhst_valobj[] = {
-  {V_RLOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_LOCK, 0, MACHINE_TABLE, 0, "mach_id", MR_DEADLOCK},
-  {V_RLOCK, 0, NFSPHYS_TABLE, 0, "nfsphys_id", MR_DEADLOCK},
-  {V_RLOCK, 0, SERVERHOSTS_TABLE, 0, "mach_id", MR_DEADLOCK},
-  {V_RLOCK, 0, HOSTACCESS_TABLE, 0, "mach_id", MR_DEADLOCK},
-  {V_RLOCK, 0, HOSTALIAS_TABLE, 0, "mach_id", MR_DEADLOCK},
-  {V_LOCK, 0, MCMAP_TABLE, 0, "mach_id", MR_DEADLOCK},
-  {V_RLOCK, 0, PRINTCAP_TABLE, 0, "mach_id", MR_DEADLOCK},
-  {V_RLOCK, 0, PALLADIUM_TABLE, 0, "mach_id", MR_DEADLOCK},
-  {V_ID, 0, MACHINE_TABLE, "name", "mach_id", MR_MACHINE},
-};
-
 static struct validate dhst_validate = {
-  dhst_valobj,
-  10,
+  VOmach0,
+  1,
   0,
   0,
   0,
@@ -843,13 +782,12 @@ static struct validate ahal_validate = {
 
 static struct valobj dhal_valobj[] = {
   {V_UPWILD, 0},
-  {V_LOCK, 0, MACHINE_TABLE, 0, "mach_id", MR_DEADLOCK},
   {V_ID, 1, MACHINE_TABLE, "name", "mach_id", MR_MACHINE},
 };
 
 static struct validate dhal_validate = {
   dhal_valobj,
-  3,
+  2,
   "name",
   "name = '%s' AND mach_id = %d",
   2,
@@ -865,16 +803,9 @@ static char *gsnt_fields[] = {
   "modby", "modby", "modwith"
 };
 
-static struct valobj gsnt_valobj[] = {
-  {V_RLOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_RLOCK, 0, SUBNET_TABLE, 0, "snet_id", MR_DEADLOCK},
-  {V_RLOCK, 0, LIST_TABLE, 0, "list_id", MR_DEADLOCK},
-  {V_UPWILD, 0},
-};
-
 static struct validate gsnt_validate = {
-  gsnt_valobj,
-  4,
+  VOupwild0,
+  1,
   0,
   0,
   0,
@@ -889,9 +820,6 @@ static char *asnt_fields[] = {
 };
 
 static struct valobj asnt_valobj[] = {
-  {V_RLOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_LOCK, 0, SUBNET_TABLE, 0, "snet_id", MR_DEADLOCK},
-  {V_RLOCK, 0, LIST_TABLE, 0, "list_id", MR_DEADLOCK},
   {V_CHAR, 0, SUBNET_TABLE, "name"},
   {V_LEN, 1, SUBNET_TABLE, "description"},
   {V_NUM, 2},
@@ -906,7 +834,7 @@ static struct valobj asnt_valobj[] = {
 static struct validate asnt_validate =
 {
   asnt_valobj,
-  12,
+  9,
   "name",
   "name = UPPER('%s')",
   1,
@@ -922,9 +850,6 @@ static char *usnt_fields[] = {
 };
 
 static struct valobj usnt_valobj[] = {
-  {V_RLOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_LOCK, 0, SUBNET_TABLE, 0, "snet_id", MR_DEADLOCK},
-  {V_RLOCK, 0, LIST_TABLE, 0, "list_id", MR_DEADLOCK},
   {V_ID, 0, SUBNET_TABLE, "name", "snet_id", MR_NO_MATCH},
   {V_RENAME, 1, SUBNET_TABLE, "name", "snet_id", MR_NOT_UNIQUE},
   {V_LEN, 2, SUBNET_TABLE, "description"},
@@ -940,7 +865,7 @@ static struct valobj usnt_valobj[] = {
 static struct validate usnt_validate =
 {
   usnt_valobj,
-  13,
+  10,
   "name",
   "snet_id = %d",
   1,
@@ -954,15 +879,9 @@ static char *dsnt_fields[] = {
   "name",
 };
 
-static struct valobj dsnt_valobj[] = {
-  {V_RLOCK, 0, MACHINE_TABLE, 0, "mach_id", MR_DEADLOCK},
-  {V_LOCK, 0, SUBNET_TABLE, 0, "snet_id", MR_DEADLOCK},
-  {V_ID, 0, SUBNET_TABLE, "name", "snet_id", MR_SUBNET},
-};
-
 static struct validate dsnt_validate = {
-  dsnt_valobj,
-  3,
+  VOsnet0,
+  1,
   0,
   0,
   0,
@@ -982,7 +901,6 @@ static char *aclu_fields[] = {
 };
 
 static struct valobj aclu_valobj[] = {
-  {V_LOCK, 0, CLUSTERS_TABLE, 0, "clu_id", MR_DEADLOCK},
   {V_CHAR, 0, CLUSTERS_TABLE, "name"},
   {V_LEN, 1, CLUSTERS_TABLE, "description"},
   {V_LEN, 2, CLUSTERS_TABLE, "location"},
@@ -991,7 +909,7 @@ static struct valobj aclu_valobj[] = {
 static struct validate aclu_validate =
 {
   aclu_valobj,
-  4,
+  3,
   "name",
   "name = '%s'",
   1,
@@ -1007,7 +925,6 @@ static char *uclu_fields[] = {
 };
 
 static struct valobj uclu_valobj[] = {
-  {V_LOCK, 0, CLUSTERS_TABLE, 0, "clu_id", MR_DEADLOCK},
   {V_ID, 0, CLUSTERS_TABLE, "name", "clu_id", MR_CLUSTER},
   {V_RENAME, 1, CLUSTERS_TABLE, "name", "clu_id", MR_NOT_UNIQUE},
   {V_LEN, 2, CLUSTERS_TABLE, "description"},
@@ -1016,7 +933,7 @@ static struct valobj uclu_valobj[] = {
 
 static struct validate uclu_validate = {
   uclu_valobj,
-  5,
+  4,
   0,
   0,
   0,
@@ -1103,14 +1020,9 @@ static struct validate acld_validate =
   set_cluster_modtime_by_id,
 };
 
-static struct valobj dcld_valobj[] =
-{
-  {V_ID, 0, CLUSTERS_TABLE, "name", "clu_id", MR_CLUSTER},
-};
-
 static struct validate dcld_validate =
 {
-  dcld_valobj,
+  VOclu0,
   1,
   "clu_id",
   "clu_id = %d AND serv_label = '%s' AND serv_cluster = '%s'",
@@ -1145,8 +1057,6 @@ static char *alis_fields[] = {
 };
 
 static struct valobj alis_valobj[] = {
-  {V_RLOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_LOCK, 0, LIST_TABLE, 0, "list_id", MR_DEADLOCK},
   {V_CHAR, 0, LIST_TABLE, "name"},
   {V_NUM, 1},
   {V_NUM, 2},
@@ -1161,7 +1071,7 @@ static struct valobj alis_valobj[] = {
 
 static struct validate alis_validate = {
   alis_valobj,
-  12,
+  10,
   "name",
   "name = '%s'",
   1,
@@ -1178,8 +1088,6 @@ static char *ulis_fields[] = {
 };
 
 static struct valobj ulis_valobj[] = {
-  {V_RLOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_LOCK, 0, LIST_TABLE, 0, "list_id", MR_DEADLOCK},
   {V_ID, 0, LIST_TABLE, "name", "list_id", MR_LIST},
   {V_RENAME, 1, LIST_TABLE, "name", "list_id", MR_NOT_UNIQUE},
   {V_NUM, 2},
@@ -1195,7 +1103,7 @@ static struct valobj ulis_valobj[] = {
 
 static struct validate ulis_validate = {
   ulis_valobj,
-  13,
+  11,
   "name",
   "list_id = %d",
   1,
@@ -1209,20 +1117,9 @@ static char *dlis_fields[] = {
   "name",
 };
 
-static struct valobj dlis_valobj[] = {
-  {V_RLOCK, 0, CAPACLS_TABLE, 0, "list_id", MR_DEADLOCK},
-  {V_RLOCK, 0, IMEMBERS_TABLE, 0, "list_id", MR_DEADLOCK},
-  {V_RLOCK, 0, FILESYS_TABLE, 0, "filsys_id", MR_DEADLOCK},
-  {V_LOCK, 0, LIST_TABLE, 0, "list_id", MR_DEADLOCK},
-  {V_RLOCK, 0, QUOTA_TABLE, 0, "filsys_id", MR_DEADLOCK},
-  {V_RLOCK, 0, ZEPHYR_TABLE, 0, "xmt_id", MR_DEADLOCK},
-  {V_RLOCK, 0, HOSTACCESS_TABLE, 0, "mach_id", MR_DEADLOCK},
-  {V_ID, 0, LIST_TABLE, "name", "list_id", MR_LIST}
-};
-
 static struct validate dlis_validate = {
-  dlis_valobj,
-  8,
+  VOlist0,
+  1,
   "name",
   "list_id = %d",
   1,
@@ -1237,8 +1134,6 @@ static char *amtl_fields[] = {
 };
 
 static struct valobj amtl_valobj[] = {
-  {V_RLOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_LOCK, 0, LIST_TABLE, 0, "list_id", MR_DEADLOCK},
   {V_ID, 0, LIST_TABLE, "name", "list_id", MR_LIST},
   {V_TYPE, 1, 0, "member", 0, MR_TYPE},
   {V_TYPEDATA, 2, 0, 0, 0, MR_NO_MATCH},
@@ -1247,7 +1142,7 @@ static struct valobj amtl_valobj[] = {
 static struct validate amtl_validate =
 {
   amtl_valobj,
-  5,
+  3,
   0,
   0,
   0,
@@ -1260,7 +1155,7 @@ static struct validate amtl_validate =
 static struct validate dmfl_validate =
 {
   amtl_valobj,
-  5,
+  3,
   0,
   0,
   0,
@@ -1276,18 +1171,13 @@ static char *gaus_fields[] = {
 };
 
 static struct valobj gaus_valobj[] = {
-  {V_RLOCK, 0, FILESYS_TABLE, 0, "filsys_id", MR_DEADLOCK},
-  {V_RLOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_RLOCK, 0, LIST_TABLE, 0, "list_id", MR_DEADLOCK},
-  {V_RLOCK, 0, ZEPHYR_TABLE, 0, "xmt_id", MR_DEADLOCK},
-  {V_RLOCK, 0, HOSTACCESS_TABLE, 0, "mach_id", MR_DEADLOCK},
   {V_TYPE, 0, 0, "gaus", 0, MR_TYPE},
   {V_TYPEDATA, 1, 0, 0, 0, MR_NO_MATCH},
 };
 
 static struct validate gaus_validate = {
   gaus_valobj,
-  7,
+  2,
   0,
   0,
   0,
@@ -1327,15 +1217,9 @@ static char *gmol_fields[] = {
   "member_type", "member_name",
 };
 
-static struct valobj gmol_valobj[] = {
-  {V_LOCK, 0, IMEMBERS_TABLE, 0, "list_id", MR_DEADLOCK},
-  {V_RLOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_ID, 0, LIST_TABLE, "name", "list_id", MR_LIST},
-
-};
 static struct validate gmol_validate = {
-  gmol_valobj,
-  3,
+  VOlist0,
+  1,
   0,
   0,
   0,
@@ -1346,8 +1230,8 @@ static struct validate gmol_validate = {
 };
 
 static struct validate geml_validate = {
-  gmol_valobj,
-  3,
+  VOlist0,
+  1,
   0,
   0,
   0,
@@ -1363,16 +1247,13 @@ static char *glom_fields[] = {
 };
 
 static struct valobj glom_valobj[] = {
-  {V_LOCK, 0, IMEMBERS_TABLE, 0, "list_id", MR_DEADLOCK},
-  {V_RLOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_RLOCK, 0, LIST_TABLE, 0, "list_id", MR_DEADLOCK},
   {V_TYPE, 0, 0, "rmember", 0, MR_TYPE},
   {V_TYPEDATA, 1, 0, 0, 0, MR_NO_MATCH},
 };
 
 static struct validate glom_validate = {
   glom_valobj,
-  5,
+  2,
   0,
   0,
   0,
@@ -1406,17 +1287,10 @@ static char *gsin_fields[] = {
   "ace_type", "ace_name", "modby", "modby", "modwith",
 };
 
-static struct valobj gsin_valobj[] =
-{
-  {V_RLOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_RLOCK, 0, LIST_TABLE, 0, "list_id", MR_DEADLOCK},
-  {V_UPWILD, 0 },
-};
-
 static struct validate gsin_validate =
 {
-  gsin_valobj,
-  3,
+  VOupwild0,
+  1,
   0,
   0,
   0,
@@ -1455,9 +1329,6 @@ static char *asin_fields[] = {
 };
 
 static struct valobj asin_valobj[] = {
-  {V_RLOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_LOCK, 0, MACHINE_TABLE, 0, "mach_id", MR_DEADLOCK},
-  {V_RLOCK, 0, LIST_TABLE, 0, "list_id", MR_DEADLOCK},
   {V_CHAR, 0, SERVERS_TABLE, "name"},
   {V_NUM, 1},
   {V_LEN, 2, SERVERS_TABLE, "target_file"},
@@ -1471,7 +1342,7 @@ static struct valobj asin_valobj[] = {
 static struct validate asin_validate = /* for asin, usin */
 {
   asin_valobj,
-  11,
+  8,
   "name",
   "name = UPPER('%s')",
   1,
@@ -1483,7 +1354,7 @@ static struct validate asin_validate =    /* for asin, usin */
 
 static struct validate rsve_validate = {
   asin_valobj,
-  3,
+  1,
   "name",
   "name = UPPER('%s')",
   1,
@@ -1498,9 +1369,7 @@ static char *ssif_fields[] = {
 };
 
 static struct valobj ssif_valobj[] = {
-  {V_RLOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_LOCK, 0, MACHINE_TABLE, 0, "mach_id", MR_DEADLOCK},
-  {V_RLOCK, 0, LIST_TABLE, 0, "list_id", MR_DEADLOCK},
+  {V_NAME, 0, SERVERS_TABLE, "name", 0, MR_SERVICE},
   {V_NUM, 1},
   {V_NUM, 2},
   {V_NUM, 3},
@@ -1510,7 +1379,7 @@ static struct valobj ssif_valobj[] = {
 
 static struct validate ssif_validate = {
   ssif_valobj,
-  8,
+  6,
   "name",
   "name = UPPER('%s')",
   1,
@@ -1526,7 +1395,7 @@ static char *dsin_fields[] = {
 
 static struct validate dsin_validate = {
   asin_valobj,
-  3,
+  1,
   "name",
   "name = UPPER('%s')",
   1,
@@ -1590,9 +1459,7 @@ static char *ashi_fields[] = {
 };
 
 static struct valobj ashi_valobj[] = {
-  {V_LOCK, 0, MACHINE_TABLE, 0, "mach_id", MR_DEADLOCK},
   {V_NAME, 0, SERVERS_TABLE, "name", 0, MR_SERVICE},
-  {V_LOCK, 0, SERVERHOSTS_TABLE, 0, "mach_id", MR_DEADLOCK},
   {V_ID, 1, MACHINE_TABLE, "name", "mach_id", MR_MACHINE},
   {V_NUM, 2},
   {V_NUM, 3},
@@ -1603,7 +1470,7 @@ static struct valobj ashi_valobj[] = {
 static struct validate ashi_validate = /* ashi & ushi */
 {
   ashi_valobj,
-  8,
+  6,
   "service",
   "service = UPPER('%s') AND mach_id = %d",
   2,
@@ -1616,7 +1483,7 @@ static struct validate ashi_validate = /* ashi & ushi */
 static struct validate rshe_validate =
 {
   ashi_valobj,
-  4,
+  2,
   "service",
   "service = UPPER('%s') AND mach_id = %d",
   2,
@@ -1629,7 +1496,7 @@ static struct validate rshe_validate =
 static struct validate ssho_validate =
 {
   ashi_valobj,
-  4,
+  2,
   "service",
   "service = UPPER('%s') AND mach_id = %d",
   2,
@@ -1645,7 +1512,6 @@ static char *sshi_fields[] = {
 };
 
 static struct valobj sshi_valobj[] = {
-  {V_RLOCK, 0, MACHINE_TABLE, 0, "mach_id", MR_DEADLOCK},
   {V_NAME, 0, SERVERS_TABLE, "name", 0, MR_SERVICE},
   {V_ID, 1, MACHINE_TABLE, "name", "mach_id", MR_MACHINE},
   {V_NUM, 2},
@@ -1660,7 +1526,7 @@ static struct valobj sshi_valobj[] = {
 static struct validate sshi_validate =
 {
   sshi_valobj,
-  10,
+  9,
   0,
   0,
   0,
@@ -1677,7 +1543,7 @@ static char *dshi_fields[] = {
 static struct validate dshi_validate =
 {
   ashi_valobj,
-  4,
+  2,
   "service",
   "service = UPPER('%s') AND mach_id = %d",
   2,
@@ -1704,14 +1570,9 @@ static char *gfsm_fields[] = {
   "create", "lockertype", "modby", "modby", "modwith",
 };
 
-static struct valobj gfsm_valobj[] = {
-  {V_RLOCK, 0, FILESYS_TABLE, 0, "filsys_id", MR_DEADLOCK},
-  {V_ID, 0, MACHINE_TABLE, "name", "mach_id", MR_MACHINE},
-};
-
 static struct validate gfsm_validate = {
-  gfsm_valobj,
-  2,
+  VOmach0,
+  1,
   0,
   0,
   0,
@@ -1729,14 +1590,13 @@ static char *gfsn_fields[] = {
 
 static struct valobj gfsn_valobj[] =
 {
-  {V_RLOCK, 0, FILESYS_TABLE, 0, "filsys_id", MR_DEADLOCK},
   {V_ID, 0, MACHINE_TABLE, "name", "mach_id", MR_MACHINE},
   {V_WILD, 1},
 };
 
 static struct validate gfsn_validate = {
   gfsn_valobj,
-  3,
+  2,
   0,
   0,
   0,
@@ -1758,14 +1618,9 @@ static char *gfsg_fields[] = {
   "create", "lockertype", "modby", "modby", "modwith",
 };
 
-static struct valobj gfsg_valobj[] = {
-  {V_RLOCK, 0, FILESYS_TABLE, 0, "filsys_id", MR_DEADLOCK},
-  {V_ID, 0, LIST_TABLE, "name", "list_id", MR_LIST}
-};
-
 static struct validate gfsg_validate = {
-  gfsg_valobj,
-  2,
+  VOlist0,
+  1,
   0,
   0,
   0,
@@ -1781,10 +1636,6 @@ static char *afil_fields[] = {
 };
 
 static struct valobj afil_valobj[] = {
-  {V_LOCK, 0, FILESYS_TABLE, 0, "filsys_id", MR_DEADLOCK},
-  {V_RLOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_RLOCK, 0, MACHINE_TABLE, 0, "mach_id", MR_DEADLOCK},
-  {V_RLOCK, 0, LIST_TABLE, 0, "list_id", MR_DEADLOCK},
   {V_CHAR, 0, FILESYS_TABLE, "label"},
   {V_TYPE, 1, 0, "filesys", 0, MR_FSTYPE},
   {V_ID, 2, MACHINE_TABLE, "name", "mach_id", MR_MACHINE},
@@ -1800,7 +1651,7 @@ static struct valobj afil_valobj[] = {
 
 static struct validate afil_validate = {
   afil_valobj,
-  15,
+  11,
   "label",
   "label = '%s'",
   1,
@@ -1816,11 +1667,6 @@ static char *ufil_fields[] = {
 };
 
 static struct valobj ufil_valobj[] = {
-  {V_LOCK, 0, FILESYS_TABLE, 0, "filsys_id", MR_DEADLOCK},
-  {V_RLOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_RLOCK, 0, MACHINE_TABLE, 0, "mach_id", MR_DEADLOCK},
-  {V_RLOCK, 0, LIST_TABLE, 0, "list_id", MR_DEADLOCK},
-  {V_LOCK, 0, QUOTA_TABLE, 0, "filsys_id", MR_DEADLOCK},
   {V_ID, 0, FILESYS_TABLE, "label", "filsys_id", MR_FILESYS},
   {V_RENAME, 1, FILESYS_TABLE, "label", "filsys_id", MR_NOT_UNIQUE},
   {V_TYPE, 2, 0, "filesys", 0, MR_FSTYPE},
@@ -1837,7 +1683,7 @@ static struct valobj ufil_valobj[] = {
 
 static struct validate ufil_validate = {
   ufil_valobj,
-  17,
+  12,
   "label",
   "filsys_id = %d",
   1,
@@ -1851,17 +1697,9 @@ static char *dfil_fields[] = {
   "label",
 };
 
-static struct valobj dfil_valobj[] = {
-  {V_LOCK, 0, FILESYS_TABLE, 0, "filsys_id", MR_DEADLOCK},
-  {V_LOCK, 0, NFSPHYS_TABLE, 0, "nfsphys_id", MR_DEADLOCK},
-  {V_LOCK, 0, QUOTA_TABLE, 0, "filsys_id", MR_DEADLOCK},
-  {V_LOCK, 0, FSGROUP_TABLE, 0, "filsys_id", MR_DEADLOCK},
-  {V_ID, 0, FILESYS_TABLE, "label", "filsys_id", MR_FILESYS},
-};
-
 static struct validate dfil_validate = {
-  dfil_valobj,
-  5,
+  VOfilesys0,
+  1,
   "label",
   "filsys_id = %d",
   1,
@@ -1875,12 +1713,8 @@ static char *gfgm_fields[] = {
   "fsgroup", "filesys", "sortkey"
 };
 
-static struct valobj gfgm_valobj[] = {
-  {V_ID, 0, FILESYS_TABLE, "label", "filsys_id", MR_FILESYS},
-};
-
 static struct validate gfgm_validate = {
-  gfgm_valobj,
+  VOfilesys0,
   1,
   0,
   0,
@@ -1892,15 +1726,13 @@ static struct validate gfgm_validate = {
 };
 
 static struct valobj aftg_valobj[] = {
-  {V_LOCK, 0, FILESYS_TABLE, 0, "filsys_id", MR_DEADLOCK},
-  {V_LOCK, 0, FSGROUP_TABLE, 0, "filsys_id", MR_DEADLOCK},
   {V_ID, 0, FILESYS_TABLE, "label", "filsys_id", MR_FILESYS},
   {V_ID, 1, FILESYS_TABLE, "label", "filsys_id", MR_FILESYS},
 };
 
 static struct validate aftg_validate = {
   aftg_valobj,
-  4,
+  2,
   "group_id",
   "group_id = %d and filsys_id = %d",
   2,
@@ -1921,13 +1753,12 @@ static char *gnfp_fields[] = {
 
 static struct valobj gnfp_valobj[] = {
   {V_ID, 0, MACHINE_TABLE, "name", "mach_id", MR_MACHINE},
-  {V_RLOCK, 0, NFSPHYS_TABLE, 0, "nfsphys_id", MR_DEADLOCK},
   {V_WILD, 1},
 };
 
 static struct validate gnfp_validate = {
   gnfp_valobj,
-  3,
+  2,
   0,
   0,
   0,
@@ -1938,8 +1769,6 @@ static struct validate gnfp_validate = {
 };
 
 static struct valobj anfp_valobj[] = {
-  {V_RLOCK, 0, MACHINE_TABLE, 0, "mach_id", MR_DEADLOCK},
-  {V_LOCK, 0, NFSPHYS_TABLE, 0, "nfsphys_id", MR_DEADLOCK},
   {V_ID, 0, MACHINE_TABLE, "name", "mach_id", MR_MACHINE},
   {V_CHAR, 1, NFSPHYS_TABLE, "dir"},
   {V_LEN, 2, NFSPHYS_TABLE, "device"},
@@ -1950,7 +1779,7 @@ static struct valobj anfp_valobj[] = {
 
 static struct validate anfp_validate = {
   anfp_valobj,
-  8,
+  6,
   "dir",
   "mach_id = %d and dir = '%s'",
   2,
@@ -1962,7 +1791,7 @@ static struct validate anfp_validate = {
 
 static struct validate unfp_validate = {
   anfp_valobj,
-  8,
+  6,
   "dir",
   "mach_id = %d and dir = '%s'",
   2,
@@ -1977,8 +1806,6 @@ static char *ajnf_fields[] = {
 };
 
 static struct valobj ajnf_valobj[] = {
-  {V_RLOCK, 0, MACHINE_TABLE, 0, "mach_id", MR_DEADLOCK},
-  {V_LOCK, 0, NFSPHYS_TABLE, 0, "nfsphys_id", MR_DEADLOCK},
   {V_ID, 0, MACHINE_TABLE, NAME, "mach_id", MR_MACHINE},
   {V_CHAR, 1, NFSPHYS_TABLE, "dir"},
   {V_NUM, 2},
@@ -1986,7 +1813,7 @@ static struct valobj ajnf_valobj[] = {
 
 static struct validate ajnf_validate = {
   ajnf_valobj,
-  5,
+  3,
   "dir",
   "mach_id = %d and dir = '%s'",
   2,
@@ -2000,16 +1827,9 @@ static char *dnfp_fields[] = {
   "machine", "dir",
 };
 
-static struct valobj dnfp_valobj[] = {
-  {V_RLOCK, 0, FILESYS_TABLE, 0, "filsys_id", MR_DEADLOCK},
-  {V_LOCK, 0, MACHINE_TABLE, 0, "mach_id", MR_DEADLOCK},
-  {V_LOCK, 0, NFSPHYS_TABLE, 0, "nfsphys_id", MR_DEADLOCK},
-  {V_ID, 0, MACHINE_TABLE, "name", "mach_id", MR_MACHINE},
-};
-
 static struct validate dnfp_validate = {
-  dnfp_valobj,
-  4,
+  anfp_valobj,
+  2,
   "dir",
   "mach_id = %d and dir = '%s'",
   2,
@@ -2025,11 +1845,6 @@ static char *gqot_fields[] = {
 };
 
 static struct valobj gqot_valobj[] = {
-  {V_RLOCK, 0, FILESYS_TABLE, 0, "filsys_id", MR_DEADLOCK},
-  {V_RLOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_RLOCK, 0, LIST_TABLE, 0, "list_id", MR_DEADLOCK},
-  {V_RLOCK, 0, NFSPHYS_TABLE, 0, "nfsphys_id", MR_DEADLOCK},
-  {V_RLOCK, 0, QUOTA_TABLE, 0, "filsys_id", MR_DEADLOCK},
   {V_WILD, 0},
   {V_TYPE, 1, 0, "quota_type", 0, MR_TYPE},
   {V_TYPEDATA, 2, 0, 0, 0, MR_ACE},
@@ -2037,7 +1852,7 @@ static struct valobj gqot_valobj[] = {
 
 static struct validate gqot_validate = {
   gqot_valobj,
-  8,
+  3,
   0,
   0,
   0,
@@ -2069,11 +1884,6 @@ static char *aqot_fields[] = {
 };
 
 static struct valobj aqot_valobj[] = {
-  {V_LOCK, 0, FILESYS_TABLE, 0, "filsys_id", MR_DEADLOCK},
-  {V_RLOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_RLOCK, 0, LIST_TABLE, 0, "list_id", MR_DEADLOCK},
-  {V_LOCK, 0, NFSPHYS_TABLE, 0, "nfsphys_id", MR_DEADLOCK},
-  {V_LOCK, 0, QUOTA_TABLE, 0, "filsys_id", MR_DEADLOCK},
   {V_ID, 0, FILESYS_TABLE, "label", "filsys_id", MR_FILESYS},
   {V_TYPE, 1, 0, "quota_type", 0, MR_TYPE},
   {V_TYPEDATA, 2, 0, 0, 0, MR_ACE},
@@ -2082,7 +1892,7 @@ static struct valobj aqot_valobj[] = {
 
 static struct validate aqot_validate = {
   aqot_valobj,
-  9,
+  4,
   "filsys_id",
   "filsys_id = %d and type = '%s' and entity_id = %d",
   3,
@@ -2094,7 +1904,7 @@ static struct validate aqot_validate = {
 
 static struct validate uqot_validate = {
   aqot_valobj,
-  9,
+  4,
   "filsys_id",
   "filsys_id = %d AND type = '%s' AND entity_id = %d",
   3,
@@ -2106,7 +1916,7 @@ static struct validate uqot_validate = {
 
 static struct validate dqot_validate = {
   aqot_valobj,
-  8,
+  3,
   "filsys_id",
   "filsys_id = %d AND type = '%s' AND entity_id = %d",
   3,
@@ -2150,7 +1960,6 @@ static char *anfq_fields[] = {
 };
 
 static struct valobj anfq_valobj[] = {
-  {V_LOCK, 0, FILESYS_TABLE, 0, "filsys_id", MR_DEADLOCK},
   {V_ID, 0, FILESYS_TABLE, "label", "filsys_id", MR_FILESYS},
   {V_ID, 1, USERS_TABLE, "login", "users_id", MR_USER},
   {V_NUM, 2},
@@ -2158,7 +1967,7 @@ static struct valobj anfq_valobj[] = {
 
 static struct validate anfq_validate = {
   anfq_valobj,
-  4,
+  3,
   "filsys_id",
   "filsys_id = %d AND type = 'USER' AND entity_id = %d",
   2,
@@ -2170,7 +1979,7 @@ static struct validate anfq_validate = {
 
 static struct validate unfq_validate = {
   anfq_valobj,
-  4,
+  3,
   "filsys_id",
   "filsys_id = %d AND type = 'USER' AND entity_id = %d",
   2,
@@ -2182,7 +1991,7 @@ static struct validate unfq_validate = {
 
 static struct validate dnfq_validate = {
   anfq_valobj,
-  4,
+  3,
   "filsys_id",
   "filsys_id = %d AND entity_id = %d",
   2,
@@ -2198,15 +2007,9 @@ static char *gzcl_fields[] = {
   "iws_type", "iws_name", "iui_type", "iui_name", "modby", "modby", "modwith",
 };
 
-static struct valobj gzcl_valobj[] = {
-  {V_RLOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_RLOCK, 0, LIST_TABLE, 0, "list_id", MR_DEADLOCK},
-  {V_RLOCK, 0, ZEPHYR_TABLE, 0, "xmt_id", MR_DEADLOCK},
-  {V_WILD, 0},
-};
 static struct validate gzcl_validate = {
-  gzcl_valobj,
-  4,
+  VOwild0,
+  1,
   0,
   0,
   0,
@@ -2222,9 +2025,6 @@ static char *azcl_fields[] = {
 };
 
 static struct valobj azcl_valobj[] = {
-  {V_RLOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_RLOCK, 0, LIST_TABLE, 0, "list_id", MR_DEADLOCK},
-  {V_LOCK, 0, ZEPHYR_TABLE, 0, "xmt_id", MR_DEADLOCK},
   {V_CHAR, 0, ZEPHYR_TABLE, "class"},
   {V_TYPE, 1, 0, "ace_type", 0, MR_ACE},
   {V_TYPEDATA, 2, 0, 0, "list_id", MR_ACE},
@@ -2238,7 +2038,7 @@ static struct valobj azcl_valobj[] = {
 
 static struct validate azcl_validate = {
   azcl_valobj,
-  12,
+  9,
   "class",
   "class = '%s'",
   1,
@@ -2254,9 +2054,7 @@ static char *uzcl_fields[] = {
 };
 
 static struct valobj uzcl_valobj[] = {
-  {V_RLOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_RLOCK, 0, LIST_TABLE, 0, "list_id", MR_DEADLOCK},
-  {V_LOCK, 0, ZEPHYR_TABLE, 0, "xmt_id", MR_DEADLOCK},
+  {V_NAME, 0, ZEPHYR_TABLE, "class", 0, MR_BAD_CLASS},
   {V_RENAME, 1, ZEPHYR_TABLE, "class", 0, MR_NOT_UNIQUE},
   {V_TYPE, 2, 0, "ace_type", 0, MR_ACE},
   {V_TYPEDATA, 3, 0, 0, "list_id", MR_ACE},
@@ -2270,7 +2068,7 @@ static struct valobj uzcl_valobj[] = {
 
 static struct validate uzcl_validate = {
   uzcl_valobj,
-  12,
+  10,
   "class",
   "class = '%s'",
   1,
@@ -2315,9 +2113,7 @@ static char *asha_fields[] = {
 };
 
 static struct valobj asha_valobj[] = {
-  {V_RLOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
   {V_ID, 0, MACHINE_TABLE, "name", "mach_id", MR_MACHINE},
-  {V_RLOCK, 0, LIST_TABLE, 0, "list_id", MR_DEADLOCK},
   {V_TYPE, 1, 0, "ace_type", 0, MR_ACE},
   {V_TYPEDATA, 2, 0, 0, 0, MR_ACE},
 };
@@ -2325,7 +2121,7 @@ static struct valobj asha_valobj[] = {
 static struct validate asha_validate =
 {
   asha_valobj,
-  5,
+  3,
   "mach_id",
   "mach_id = %d",
   1,
@@ -2370,16 +2166,9 @@ static char *gpce_fields[] = {
   "modby", "modby", "modwith",
 };
 
-static struct valobj gpce_valobj[] = {
-  {V_RLOCK, 0, USERS_TABLE, 0, "users_id", MR_DEADLOCK},
-  {V_RLOCK, 0, MACHINE_TABLE, 0, "mach_id", MR_DEADLOCK},
-  {V_RLOCK, 0, PRINTCAP_TABLE, 0, "mach_id", MR_DEADLOCK},
-  {V_WILD, 0},
-};
-
 static struct validate gpce_validate = {
-  gpce_valobj,
-  4,
+  VOwild0,
+  1,
   0,
   0,
   0,

diff --git a/server/query.h b/server/query.h
index 0034c4a60aef9807a78671f162b5505589378d33..735f43a42867f9e2f20485af5fe74e30aaa5e9a5 100644 (file)
--- a/server/query.h
+++ b/server/query.h
@@ -50,9 +50,8 @@ struct validate
 };
 
 /* Validated Object Types */
-enum vo_type {V_NAME, V_ID, V_TYPE, V_TYPEDATA,
-             V_RENAME, V_CHAR, V_LOCK, V_WILD, V_UPWILD,
-              V_RLOCK, V_LEN, V_NUM};
+enum vo_type {V_NAME, V_ID, V_TYPE, V_TYPEDATA, V_RENAME, V_CHAR,
+             V_WILD, V_UPWILD, V_LEN, V_NUM};
 
 /* Validated Object Definition */
 struct valobj

diff --git a/server/qvalidate.pc b/server/qvalidate.pc
index 082a9c815d260fd21d9ffe1146643faf7ceb60f6..a49f7eb5fcda6f11abf31947d5e4e0170a9dd161 100644 (file)
--- a/server/qvalidate.pc
+++ b/server/qvalidate.pc
@@ -37,8 +37,6 @@ int validate_type(char *argv[], struct valobj *vo);
 int validate_typedata(struct query *, char *argv[], struct valobj *vo);
 int validate_len(char *argv[], struct valobj *vo);
 int validate_num(char *argv[], struct valobj *vo);
-int lock_table(struct valobj *vo);
-int readlock_table(struct valobj *vo);
 int convert_wildcards_uppercase(char *arg);
 
 extern SQLDA *sqlald(int, int, int);
@@ -113,14 +111,6 @@ int validate_fields(struct query *q, char *argv[], struct valobj *vo, int n)
          status = validate_num(argv, vo);
          break;
 
-       case V_LOCK:
-         status = lock_table(vo);
-         break;
-
-        case V_RLOCK:
-         status = readlock_table(vo);
-         break;
-
         case V_WILD:
          status = convert_wildcards(argv[vo->index]);
          break;
@@ -488,44 +478,6 @@ int validate_len(char *argv[], struct valobj *vo)
   return MR_EXISTS;
 }
 
-/* Lock the table named by the validation object */
-
-int lock_table(struct valobj *vo)
-{
-#ifdef DO_LOCKING
-  sprintf(stmt_buf, "LOCK TABLE %s IN EXCLUSIVE MODE", table_name[vo->table]);
-  EXEC SQL EXECUTE IMMEDIATE :stmt_buf;
-  if (dbms_errno)
-    return mr_errcode;
-  else
-#endif
-    return MR_EXISTS;
-}
-
-/*
- * Get a read lock on the table by accessing the magic lock
- * record.  Certain tables are constructed so that they contain
- * an id field whose value is zero and a modtime field.  We
- * manipulate the modtime field of the id 0 record to effect
- * locking of the table
- */
-
-int readlock_table(struct valobj *vo)
-{
-#ifdef DO_LOCKING
-  sprintf(stmt_buf, "LOCK TABLE %s IN SHARE MODE", table_name[vo->table]);
-  EXEC SQL EXECUTE IMMEDIATE :stmt_buf;
-
-  if (dbms_errno)
-    return mr_errcode;
-  if (sqlca.sqlcode)
-    return vo->error;
-#endif
-  return MR_EXISTS;  /* validate_fields expects us to return
-                     * this value if everything went okay
-                     */
-}
-
 /* Make sure the data is numeric */
 int validate_num(char *argv[], struct valobj *vo)
 {