Fixed many '32000' errors.

diff --git a/server/queries2.c b/server/queries2.c
index 757e06d50c2fa024c92badaebb0f1b61293ecc06..219ee337f856a3eeb453e5591083307ea24ac805 100644 (file)
--- a/server/queries2.c
+++ b/server/queries2.c
@@ -418,7 +418,7 @@ static struct validate auac_validate = {
   auac_valobj,
   8,
   LOGIN,
-  "u.login = LEFT('%s',SIZE(u.login))",
+  "login = LEFT('%s',SIZE(login))",
   1,
   USERS_ID,
   0,
@@ -430,7 +430,7 @@ static struct validate ausr_validate = {
   auac_valobj,
   7,
   LOGIN,
-  "u.login = LEFT('%s',SIZE(u.login))",  
+  "login = LEFT('%s',SIZE(login))",  
   1,
   USERS_ID,
   0,
@@ -595,7 +595,7 @@ static struct validate akum_validate =
   akum_valobj,
   1,
   USERS_ID,
-  "km.users_id = %d or km.string_id = %d",
+  "users_id = %d or string_id = %d",
   2,
   USERS_ID,
   access_user,
@@ -608,7 +608,7 @@ static struct validate dkum_validate =
   akum_valobj,
   2,
   USERS_ID,
-  "km.users_id = %d and km.string_id = %d",
+  "users_id = %d and string_id = %d",
   2,
   USERS_ID,
   access_user,
@@ -755,7 +755,7 @@ static struct validate amac_validate = {
   amac_valobj,
   3,
   NAME,
-  "m.name = uppercase(LEFT('%s',SIZE(m.name)))",
+  "name = uppercase(LEFT('%s',SIZE(name)))",
   1,
   MACH_ID,
   0,
@@ -900,7 +900,7 @@ static struct validate amtc_validate = /* for amtc and dmfc */
   amtc_valobj,
   2,
   MACH_ID,
-  "mcm.mach_id = %d and mcm.clu_id = %d",
+  "mach_id = %d and clu_id = %d",
   2,
   0,
   0,
@@ -929,7 +929,7 @@ static struct validate acld_validate =
   acld_valobj,
   3,
   CLU_ID,
-  "svc.clu_id = %d AND svc.serv_label = '%s' AND svc.serv_cluster = LEFT('%s',SIZE(svc.serv_cluster))",
+  "clu_id = %d AND serv_label = '%s' AND serv_cluster = LEFT('%s',SIZE(serv_cluster))",
   3,
   0,
   0,
@@ -948,7 +948,7 @@ static struct validate dcld_validate =
   dcld_valobj,
   2,
   CLU_ID,
-  "svc.clu_id = %d AND svc.serv_label = '%s' AND svc.serv_cluster = '%s'",
+  "clu_id = %d AND serv_label = '%s' AND serv_cluster = '%s'",
   3,
   0,
   0,
@@ -1022,7 +1022,7 @@ static struct validate asin_validate =    /* for asin, usin */
   asin_valobj,
   5,
   NAME,
-  "s.name = uppercase(LEFT('%s',SIZE(s.name)))",
+  "name = uppercase(LEFT('%s',SIZE(name)))",
   1,
   0,
   0,
@@ -1034,7 +1034,7 @@ static struct validate rsve_validate = {
   asin_valobj,
   1,
   NAME,
-  "ss.name = uppercase('%s')",
+  "name = uppercase('%s')",
   1,
   0,
   access_service,
@@ -1050,7 +1050,7 @@ static struct validate ssif_validate = {
   asin_valobj,
   1,
   NAME,
-  "ss.name = uppercase('%s')",
+  "name = uppercase('%s')",
   1,
   0,
   0,
@@ -1066,7 +1066,7 @@ static struct validate dsin_validate = {
   asin_valobj,
   1,
   NAME,
-  "ss.name = uppercase('%s')",
+  "name = uppercase('%s')",
   1,
   0,
   0,
@@ -1138,7 +1138,7 @@ static struct validate ashi_validate = /* ashi & ushi */
   ashi_valobj,
   3,
   SERVICE,
-  "sh.service = uppercase(LEFT('%s',SIZE(sh.service))) AND sh.mach_id = %d",
+  "service = uppercase(LEFT('%s',SIZE(service))) AND mach_id = %d",
   2,
   0,
   access_service,
@@ -1151,7 +1151,7 @@ static struct validate rshe_validate =
   ashi_valobj,
   3,
   SERVICE,
-  "sh.service = uppercase('%s') AND sh.mach_id = %d",
+  "service = uppercase('%s') AND mach_id = %d",
   2,
   0,
   access_service,
@@ -1164,7 +1164,7 @@ static struct validate ssho_validate =
   ashi_valobj,
   3,
   SERVICE,
-  "sh.service = uppercase('%s') AND sh.mach_id = %d",
+  "service = uppercase('%s') AND mach_id = %d",
   2,
   0,
   access_service,
@@ -1174,12 +1174,12 @@ static struct validate ssho_validate =
 
 static char *sshi_fields[] = {
   "service", MACHINE, "override", "success", "inprogress",
-  "hosterror", "errmsg", "ltt", "lts"
-    };
+  "hosterror", "errmsg", "ltt", "lts",
+};
 
 static struct valobj sshi_valobj[] = {
   {V_NAME, 0, "servers", NAME, 0, MR_SERVICE},
-  {V_ID, 1, MACHINE, NAME, MACH_ID, MR_MACHINE},  /* Was this ok to add? */
+  {V_ID, 1, MACHINE, NAME, MACH_ID, MR_MACHINE},  /** Was this ok to add? */
 };
 
 static struct validate sshi_validate = 
@@ -1204,7 +1204,7 @@ static struct validate dshi_validate =
   ashi_valobj,
   3,
   SERVICE,
-  "sh.service = uppercase('%s') AND sh.mach_id = %d",
+  "service = uppercase('%s') AND mach_id = %d",
   2,
   0,
   access_service,
@@ -1245,7 +1245,7 @@ static struct validate asha_validate =
   asha_valobj,
   3,
   MACH_ID,
-  "ha.mach_id = %d",
+  "mach_id = %d",
   1,
   MACH_ID,
   0,
@@ -1350,7 +1350,7 @@ static struct validate afil_validate = {
   afil_valobj,
   8,
   LABEL,
-  "fs.label = LEFT('%s',SIZE(fs.label))",
+  "label = LEFT('%s',SIZE(label))",
   1,
   FILSYS_ID,
   0,
@@ -1379,7 +1379,7 @@ static struct validate ufil_validate = {
   ufil_valobj,
   9,
   LABEL,
-  "fs.filsys_id = %d",
+  "filsys_id = %d",
   1,
   FILSYS_ID,
   0,
@@ -1400,7 +1400,7 @@ static struct validate dfil_validate = {
   dfil_valobj,
   2,
   "label",
-  "fs.filsys_id = %d",
+  "filsys_id = %d",
   1,
   0,
   0,
@@ -1440,7 +1440,7 @@ static struct validate aftg_validate = {
   aftg_valobj,
   3,
   "group_id",
-  "fg.group_id = %d and fg.filsys_id = %d",
+  "group_id = %d and filsys_id = %d",
   2,
   0,
   0,
@@ -1483,7 +1483,7 @@ static struct validate anfp_validate = {
   anfp_valobj,
   2,
   DIR,
-  "np.mach_id = %d and np.dir = LEFT('%s',SIZE(np.dir))",
+  "mach_id = %d and dir = LEFT('%s',SIZE(dir))",
   2,
   "nfsphys_id",
   0,
@@ -1495,7 +1495,7 @@ static struct validate unfp_validate = {
   anfp_valobj,
   2,
   DIR,
-  "np.mach_id = %d and np.dir = '%s'",
+  "mach_id = %d and dir = '%s'",
   2,
   "nfsphys_id",
   0,
@@ -1515,7 +1515,7 @@ static struct validate dnfp_validate = {
   VOmach0,
   1,
   DIR,
-  "np.mach_id = %d and np.dir = '%s'",
+  "mach_id = %d and dir = '%s'",
   2,
   "nfsphys_id",
   0,
@@ -1578,7 +1578,7 @@ static struct validate aqot_validate = {
   aqot_valobj,
   4,
   FILSYS_ID,
-  "q.filsys_id = %d and q.type = '%s' and q.entity_id = %d",
+  "filsys_id = %d and type = '%s' and entity_id = %d",
   3,
   0,
   0,
@@ -1590,7 +1590,7 @@ static struct validate uqot_validate = {
   aqot_valobj,
   4,
   FILSYS_ID,
-  "q.filsys_id = %d and q.type = '%s' and q.entity_id = %d",
+  "filsys_id = %d AND type = '%s' AND entity_id = %d",
   3,
   0,
   0,
@@ -1602,7 +1602,7 @@ static struct validate dqot_validate = {
   aqot_valobj,
   4,
   FILSYS_ID,
-  "q.filsys_id = %d and q.type = '%s' and q.entity_id = %d",
+  "filsys_id = %d AND type = '%s' AND entity_id = %d",
   3,
   0,
   0,
@@ -1647,7 +1647,7 @@ static struct validate anfq_validate = {
   VOfilsys0user1,
   3,
   FILSYS_ID,
-  "q.filsys_id = %d and q.type = 'USER' and q.entity_id = %d",
+  "filsys_id = %d AND type = 'USER' AND entity_id = %d",
   2,
   0,
   0,
@@ -1659,7 +1659,7 @@ static struct validate unfq_validate = {
   VOfilsys0user1,
   3,
   FILSYS_ID,
-  "q.filsys_id = %d and q.type = 'USER' and q.entity_id = %d",
+  "filsys_id = %d AND type = 'USER' AND entity_id = %d",
   2,
   0,
   0,
@@ -1671,7 +1671,7 @@ static struct validate dnfq_validate = {
   VOfilsys0user1,
   3,
   FILSYS_ID,
-  "q.filsys_id = %d and q.entity_id = %d",
+  "filsys_id = %d AND entity_id = %d",
   2,
   0,
   0,
@@ -1713,7 +1713,7 @@ static struct validate alis_validate = {
   alis_valobj,
   4,
   NAME,
-  "l.name = LEFT('%s',SIZE(l.name))",
+  "name = LEFT('%s',SIZE(name))",
   1,
   LIST_ID,
   0,
@@ -1739,7 +1739,7 @@ static struct validate ulis_validate = {
   ulis_valobj,
   5,
   NAME,
-  "l.list_id = %d",
+  "list_id = %d",
   1,
   LIST_ID,
   access_list,
@@ -1755,7 +1755,7 @@ static struct validate dlis_validate = {
   VOlist0,
   1,
   NAME,
-  "l.list_id = %d",
+  "list_id = %d",
   1,
   0,
   access_list,
@@ -1955,7 +1955,7 @@ static struct validate azcl_validate = {
   azcl_valobj,
   9,
   CLASS,
-  "z.class = LEFT('%s',SIZE(z.class))",
+  "class = LEFT('%s',SIZE(class))",
   1,
   0,
   0,
@@ -1984,7 +1984,7 @@ static struct validate uzcl_validate = {
   uzcl_valobj,
   9,
   CLASS,
-  "z.class = '%s'",
+  "class = '%s'",
   1,
   0,
   0,
@@ -2017,7 +2017,7 @@ static struct validate asvc_validate = {
   VOchar0,
   1,
   NAME,
-  "ss.name = LEFT('%s',SIZE(ss.name))",
+  "name = LEFT('%s',SIZE(name))",
   1,
   0,
   0,
@@ -2060,7 +2060,7 @@ static struct validate apce_validate = {
   apce_valobj,
   3,
   NAME,
-  "pc.name = LEFT('%s',SIZE(pc.name))",
+  "name = LEFT('%s',SIZE(name))",
   1,
   0,
   0,
@@ -2072,7 +2072,7 @@ static struct validate dpce_validate = {
   0,
   0,
   NAME,
-  "pc.name = '%s'",
+  "name = '%s'",
   1,
   0,
   0,
@@ -2104,7 +2104,7 @@ static struct validate apdm_validate = {
   apdm_valobj,
   2,
   NAME,
-  "pal.name = LEFT('%s',SIZE(pal.name))",
+  "name = LEFT('%s',SIZE(name))",
   1,
   0,
   0,
@@ -2116,7 +2116,7 @@ static struct validate dpdm_validate = {
   0,
   0,
   NAME,
-  "pal.name = '%s'",
+  "name = '%s'",
   1,
   0,
   0,
@@ -2555,7 +2555,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "k",
     "krbmap",
-    "CHAR(u.login), CHAR(s.string) FROM krbmap km, users u, strings str",
+    "CHAR(u.login), CHAR(str.string) FROM krbmap km, users u, strings str",
     gkum_fields,
     2,
     "u.login LIKE '%s' ESCAPE '*' AND str.string LIKE '%s' ESCAPE '*' AND km.users_id = u.users_id AND km.string_id = str.string_id",