query structures updated for wildcard support. validate and valobj

structures are not yet updated.

diff --git a/server/queries2.c b/server/queries2.c
index 349674d70173191242d0487051c79480bfdadc4e..663075d128b700912493ee6349e3f713636ae5be 100644 (file)
--- a/server/queries2.c
+++ b/server/queries2.c
@@ -421,7 +421,7 @@ static struct validate akum_validate =
     akum_valobj,
     1,
     USERS_ID,
-    "kerberos.users_id = %d or kerberos.string_id = %d",
+    "krbmap.users_id = %d or krbmap.string_id = %d",
     2,
     USERS_ID,
     access_user,
@@ -434,7 +434,7 @@ static struct validate dkum_validate =
     akum_valobj,
     2,
     USERS_ID,
-    "kerberos.users_id = %d and kerberos.string_id = %d",
+    "krbmap.users_id = %d and krbmap.string_id = %d",
     2,
     USERS_ID,
     access_user,
@@ -1946,6 +1946,10 @@ static char *gats_fields[] = {
 \f
 /* Generalized Query Definitions */
 
+/* Note: For any query which uses prefetch_value, the vcnt should be
+ * one less than the number of %-format specifiers in the tlist.
+ */
+
 struct query Queries2[] = {
   {
     /* Q_GALO - GET_ALL_LOGINS */
@@ -1954,7 +1958,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,
-    "login, CHAR(uid), shell, last, first, middle FROM users",
+    "CHAR(login), CHAR(uid), shell, CHAR(last), CHAR(first), middle FROM users",
     galo_fields,
     6,
     "users_id != 0",
@@ -1969,7 +1973,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,
-    "login, CHAR(uid), shell, last, first, middle FROM users",
+    "CHAR(login), CHAR(uid), shell, CHAR(last), CHAR(first), middle FROM users",
     galo_fields,
     6,
     "status = 1",
@@ -1984,10 +1988,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,  
-    "login, CHAR(uid), shell, last, first, middle, CHAR(status), clearid, type, CHAR(modtime), CHAR(modby), modwith FROM users",
+    "CHAR(login), CHAR(uid), shell, CHAR(last), CHAR(first), middle, CHAR(status), CHAR(clearid), CHAR(type), CHAR(modtime), CHAR(modby), modwith FROM users",
     gubl_fields,
     12,
-    "login = '%s' AND users_id != 0",
+    "login LIKE '%s' ESCAPE '*' AND users_id != 0",
     1,
     &gubx_validate,
   },
@@ -1999,7 +2003,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,
-    "login, CHAR(uid), shell, last, first, middle, CHAR(status), clearid, type, CHAR(modtime), CHAR(modby), modwith FROM users",
+    "CHAR(login), CHAR(uid), shell, CHAR(last), CHAR(first), middle, CHAR(status), CHAR(clearid), CHAR(type), CHAR(modtime), CHAR(modby), modwith FROM users",
     gubu_fields,
     12,
     "uid = %s AND users_id != 0",
@@ -2014,10 +2018,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,
-    "login, CHAR(uid), shell, last, first, middle, CHAR(status), clearid, type, CHAR(modtime), CHAR(modby), modwith FROM users",
+    "CHAR(login), CHAR(uid), shell, CHAR(last), CHAR(first), middle, CHAR(status), CHAR(clearid), CHAR(type), CHAR(modtime), CHAR(modby), modwith FROM users",
     gubn_fields,
     12,
-    "first = '%s' AND last = '%s' AND users_id != 0",
+    "first LIKE '%s' ESCAPE '*' AND last LIKE '%s' ESCAPE '*' AND users_id != 0",
     2,
     &VDsortf,
   },
@@ -2029,7 +2033,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,
-    "login, CHAR(uid), shell, last, first, middle, CHAR(status), clearid, type, CHAR(modtime), CHAR(modby), modwith FROM users",
+    "CHAR(login), CHAR(uid), shell, CHAR(last), CHAR(first), middle, CHAR(status), CHAR(clearid), CHAR(type), CHAR(modtime), CHAR(modby), modwith FROM users",
     gubc_fields,
     12,
     "type = uppercase('%s') AND users_id != 0",
@@ -2044,10 +2048,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,
-    "login, CHAR(uid), shell, last, first, middle, CHAR(status), clearid, type, CHAR(modtime), CHAR(modby), modwith FROM users",
+    "CHAR(login), CHAR(uid), shell, CHAR(last), CHAR(first), middle, CHAR(status), CHAR(clearid), CHAR(type), CHAR(modtime), CHAR(modby), modwith FROM users",
     gubm_fields,
     12,
-    "clearid = '%s' AND users_id != 0",
+    "clearid LIKE '%s' ESCAPE '*' AND users_id != 0",
     1,
     &VDsortf,
   },
@@ -2153,7 +2157,7 @@ struct query Queries2[] = {
     (char *)0,
     dubu_fields,
     0,
-    "u.users_id = %d",
+    "users_id = %d",
     1,
     &dubu_validate,
   },
@@ -2165,10 +2169,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "k",
     "krbmap",
-    "u.login, s.string FROM krbmap k, users u, strings s",
+    "CHAR(u.login), CHAR(s.string) FROM krbmap k, users u, strings s",
     gkum_fields,
     2,
-    "u.login = '%s' AND s.string = '%s' AND k.users_id = u.users_id AND k.string_id = s.string_id",
+    "u.login LIKE '%s' ESCAPE '*' AND s.string LIKE '%s' ESCAPE '*' AND k.users_id = u.users_id AND k.string_id = s.string_id",
     2,
     &VDsort2,
   },
@@ -2210,7 +2214,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,
-    "login, fullname, nickname, home_addr, home_phone, office_addr, office_phone, department, affiliation, CHAR(fmodtime), CHAR(fmodby), fmodwith FROM users",
+    "CHAR(login), fullname, nickname, home_addr, home_phone, office_addr, office_phone, department, affiliation, CHAR(fmodtime), CHAR(fmodby), fmodwith FROM users",
     gfbl_fields,
     12,
     "users_id = %d",
@@ -2240,7 +2244,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,
-    "login, potype, CHAR(pop_id) + ':' + CHAR(box_id), CHAR(pmodtime), CHAR(pmodby), pmodwith FROM users",
+    "CHAR(login), potype, CHAR(pop_id) + ':' + CHAR(box_id), CHAR(pmodtime), CHAR(pmodby), pmodwith FROM users",
     gpob_fields,
     6,
     "users_id = %d",
@@ -2255,7 +2259,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,
-    "login, potype, CHAR(pop_id) + ':' + CHAR(box_id) FROM users",
+    "CHAR(login), potype, CHAR(pop_id) + ':' + CHAR(box_id) FROM users",
     gpox_fields,
     3,
     "potype != 'NONE'",
@@ -2270,7 +2274,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,
-    "login, potype, CHAR(pop_id) + ':' + CHAR(box_id) FROM users",
+    "CHAR(login), potype, CHAR(pop_id) + ':' + CHAR(box_id) FROM users",
     gpox_fields,
     3,
     "potype = 'POP'",
@@ -2285,7 +2289,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,
-    "login, potype, CHAR(pop_id) + ':' + CHAR(box_id) FROM users",
+    "CHAR(login), potype, CHAR(pop_id) + ':' + CHAR(box_id) FROM users",
     gpox_fields,
     3,
     "potype = 'SMTP'",
@@ -2345,11 +2349,11 @@ struct query Queries2[] = {
     RETRIEVE,
     "m",
     MACHINE,
-    "name, type, CHAR(modtime), CHAR(modby), modwith FROM machine",
+    "CHAR(name), type, CHAR(modtime), CHAR(modby), modwith FROM machine",
     gmac_fields,
     5,
     "name = uppercase('%s') AND mach_id != 0",
-/*    "name LIKE '%s' ESCAPE '\\' AND mach_id != 0", */ /* Pattern matching */
+/*    "name LIKE '%s' ESCAPE '*' AND mach_id != 0", */ /* Pattern matching */
     1,
     &VDsortf,
   },
@@ -2406,10 +2410,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "c",
     CLUSTER,
-    "name, description, location, CHAR(modtime), CHAR(modby), modwith FROM cluster",
+    "CHAR(name), description, location, CHAR(modtime), CHAR(modby), modwith FROM cluster",
     gclu_fields,
     6,
-    "name = '%s' AND clu_id != 0",
+    "name LIKE '%s' ESCAPE '*' AND clu_id != 0",
     1,
     &VDsortf,
   },
@@ -2466,10 +2470,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "map",
     "mcmap",
-    "m.name, c.name FROM machine m, cluster c, mcmap map",
+    "CHAR(m.name), CHAR(c.name) FROM machine m, cluster c, mcmap map",
     gmcm_fields,
     2,
-    "m.name = uppercase('%s') AND c.name = '%s' AND map.clu_id = c.clu_id AND map.mach_id = m.mach_id",
+    "m.name = uppercase('%s') AND c.name LIKE '%s' ESCAPE '*' AND map.clu_id = c.clu_id AND map.mach_id = m.mach_id",
     2,
     &VDsort2,
   },
@@ -2511,10 +2515,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "s",
     "svc",
-    "c.name, s.serv_label, s.serv_cluster FROM svc s, cluster c",
+    "CHAR(c.name), CHAR(s.serv_label), s.serv_cluster FROM svc s, cluster c",
     gcld_fields,
     3,
-    "c.clu_id = s.clu_id AND c.name = '%s' AND s.serv_label = '%s'",
+    "c.clu_id = s.clu_id AND c.name LIKE '%s' ESCAPE '*' AND s.serv_label LIKE '%s' ESCAPE '*'",
     2,
     &VDsort2,
   },
@@ -2544,7 +2548,7 @@ struct query Queries2[] = {
     (char *)0,
     acld_fields,
     0,
-    "clu_id = %d AND serv_label = '%s' AND serv_cluster = '%s'",
+    "clu_id = %d AND serv_label LIKE '%s' ESCAPE '*' AND serv_cluster = '%s'",   /** wildcard completion for serv_cluster ??? **/
     3,
     &acld_validate,
   },
@@ -2556,7 +2560,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "s",
     "servers",
-    "name, CHAR(update_int), target_file, script, CHAR(dfgen), CHAR(dfcheck), type, CHAR(enable), CHAR(inprogress), CHAR(harderror), errmsg, acl_type, CHAR(acl_id), CHAR(modtime), CHAR(modby), modwith FROM servers",
+    "CHAR(name), CHAR(update_int), target_file, script, CHAR(dfgen), CHAR(dfcheck), type, CHAR(enable), CHAR(inprogress), CHAR(harderror), errmsg, acl_type, CHAR(acl_id), CHAR(modtime), CHAR(modby), modwith FROM servers",
     gsin_fields,
     16,
     "name = uppercase('%s')",
@@ -2661,7 +2665,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "sh",
     "serverhosts",
-    "sh.service, m.name, CHAR(sh.enable), CHAR(sh.override), CHAR(sh.success), CHAR(sh.inprogress), CHAR(sh.hosterror), sh.hosterrmsg, CHAR(sh.ltt), CHAR(sh.lts), CHAR(sh.value1), CHAR(sh.value2), sh.value, CHAR(sh.modtime), CHAR(sh.modby), sh.modwith FROM serverhosts sh, machine m",
+    "CHAR(sh.service), CHAR(m.name), CHAR(sh.enable), CHAR(sh.override), CHAR(sh.success), CHAR(sh.inprogress), CHAR(sh.hosterror), sh.hosterrmsg, CHAR(sh.ltt), CHAR(sh.lts), CHAR(sh.value1), CHAR(sh.value2), sh.value, CHAR(sh.modtime), CHAR(sh.modby), sh.modwith FROM serverhosts sh, machine m",
     gshi_fields,
     16,
     "sh.service = uppercase('%s') AND m.name = uppercase('%s') AND m.mach_id = sh.mach_id",
@@ -2745,7 +2749,7 @@ struct query Queries2[] = {
   },
 
   {
-    /* Q_SSHI - SET_SERVER_HOST_INTERNAL */ /**! Would benefit from extra corr. names -- How to do it? */
+    /* Q_SSHI - SET_SERVER_HOST_INTERNAL */
     "set_server_host_internal",
     "sshi",
     UPDATE,
@@ -2754,7 +2758,11 @@ struct query Queries2[] = {
     "serverhosts SET override = %s, success = %s, inprogress = %s, hosterror = %s, hosterrmsg = '%s', ltt = %s, lts = %s",
     sshi_fields,
     7,
-    "s.service = uppercase('%s') AND s.mach_id = machine.mach_id AND machine.name = '%s'",
+#ifdef NEVER
+    "s.service = uppercase('%s') AND s.mach_id = machine.mach_id AND machine.name = '%s'", /** Turn the machine name into a mach_id in the setup routine **/
+#else
+    "service = uppercase('%s') AND mach_id = %d", 
+#endif
     2,
     &sshi_validate,
   },
@@ -2781,7 +2789,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "ha",
     "hostaccess",
-    "m.name, ha.acl_type, CHAR(ha.acl_id), CHAR(ha.modtime), CHAR(ha.modby), ha.modwith FROM hostaccess ha, machine m",
+    "CHAR(m.name), ha.acl_type, CHAR(ha.acl_id), CHAR(ha.modtime), CHAR(ha.modby), ha.modwith FROM hostaccess ha, machine m",
     gsha_fields,
     6,
     "m.name = uppercase('%s') AND ha.mach_id = m.mach_id",
@@ -2841,7 +2849,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "sh",
     "serverhosts",
-    "sh.service, m.name FROM serverhosts sh, machine m",
+    "CHAR(sh.service), CHAR(m.name) FROM serverhosts sh, machine m",
     gslo_fields,
     2,
     "sh.service = uppercase('%s') AND sh.mach_id = m.mach_id",
@@ -2856,10 +2864,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "fs",
     FILESYS,
-    "fs.label, fs.type, m.name, fs.name, fs.mount, fs.access, fs.comments, u.login, l.name, CHAR(fs.createflg), fs.lockertype, CHAR(fs.modtime), CHAR(fs.modby), fs.modwith FROM filesys fs, machine m, users u, list l",
+    "CHAR(fs.label), fs.type, CHAR(m.name), fs.name, fs.mount, fs.access, fs.comments, CHAR(u.login), CHAR(l.name), CHAR(fs.createflg), fs.lockertype, CHAR(fs.modtime), CHAR(fs.modby), fs.modwith FROM filesys fs, machine m, users u, list l",
     gfsl_fields,
     14,
-    "fs.label = '%s' AND fs.mach_id = m.mach_id AND fs.owner = u.users_id AND fs.owners = l.list_id",
+    "fs.label LIKE '%s' ESCAPE '*' AND fs.mach_id = m.mach_id AND fs.owner = u.users_id AND fs.owners = l.list_id",
     1,
     &VDsortf,
   },
@@ -2871,7 +2879,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "fs",
     FILESYS,
-    "fs.label, fs.type, m.name, fs.name, fs.mount, fs.access, fs.comments, u.login, l.name, CHAR(fs.createflg), fs.lockertype, CHAR(fs.modtime), CHAR(fs.modby), fs.modwith FROM filesys fs, machine m, users u, list l",
+    "CHAR(fs.label), fs.type, CHAR(m.name), fs.name, fs.mount, fs.access, fs.comments, CHAR(u.login), CHAR(l.name), CHAR(fs.createflg), fs.lockertype, CHAR(fs.modtime), CHAR(fs.modby), fs.modwith FROM filesys fs, machine m, users u, list l",
     gfsm_fields,
     14,
     "fs.mach_id = %d AND m.mach_id = fs.mach_id AND fs.owner = u.users_id AND fs.owners = l.list_id",
@@ -2880,13 +2888,13 @@ struct query Queries2[] = {
   },
 
   {
-    /* Q_GFSN - GET_FILESYS_BY_NFSPHYS */ 
+    /* Q_GFSN - GET_FILESYS_BY_NFSPHYS */ /** Check to make sure the stmt_buf is long enough for this query! **/ 
     "get_filesys_by_nfsphys",
     "gfsn",
     RETRIEVE,
     "fs",
     FILESYS,
-    "fs.label, fs.type, m.name, fs.name, fs.mount, fs.access, fs.comments, u.login, l.name, CHAR(fs.createflg), fs.lockertype, CHAR(fs.modtime), CHAR(fs.modby), fs.modwith FROM filesys fs, machine m, users u, list l, nfsphys np",
+    "CHAR(fs.label), fs.type, CHAR(m.name), fs.name, fs.mount, fs.access, fs.comments, CHAR(u.login), CHAR(l.name), CHAR(fs.createflg), fs.lockertype, CHAR(fs.modtime), CHAR(fs.modby), fs.modwith FROM filesys fs, machine m, users u, list l, nfsphys np",
     gfsn_fields,
     14,
     "fs.mach_id = %d AND m.mach_id = fs.mach_id AND fs.owner = u.users_id AND fs.owners = l.list_id AND np.nfsphys_id = fs.phys_id AND np.dir = '%s' AND fs.type = 'NFS'",
@@ -2901,7 +2909,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "fs",
     FILESYS,
-    "fs.label, fs.type, m.name, fs.name, fs.mount, fs.access, fs.comments, u.login, l.name, CHAR(fs.createflg), fs.lockertype, CHAR(fs.modtime), CHAR(fs.modby), fs.modwith FROM filesys fs, machine m, users u, list l",
+    "CHAR(fs.label), fs.type, CHAR(m.name), fs.name, fs.mount, fs.access, fs.comments, CHAR(u.login), CHAR(l.name), CHAR(fs.createflg), fs.lockertype, CHAR(fs.modtime), CHAR(fs.modby), fs.modwith FROM filesys fs, machine m, users u, list l",
     gfsg_fields,
     14,
     "fs.owners = %d AND m.mach_id = fs.mach_id AND fs.owner = u.users_id AND fs.owners = l.list_id",
@@ -2955,13 +2963,13 @@ struct query Queries2[] = {
   },
 
   {
-    /* Q_GFGM - GET_FSGROUOP_MEMBERS */ 
+    /* Q_GFGM - GET_FSGROUP_MEMBERS */ 
     "get_fsgroup_members",
     "gfgm",
     RETRIEVE,
     "fg",
     "fsgroup",
-    "fs.label, fg.key FROM fsgroup fg, filesys fs",
+    "CHAR(fs.label), fg.key FROM fsgroup fg, filesys fs",
     gfgm_fields,
     2,
     "fg.group_id = %d AND fs.filsys_id = fg.filsys_id",
@@ -3006,7 +3014,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "np",
     "nfsphys",
-    "m.name, np.dir, np.device, CHAR(np.status), CHAR(np.allocated), CHAR(np.size), CHAR(np.modtime), CHAR(np.modby), np.modwith FROM nfsphys np, machine m",
+    "CHAR(m.name), np.dir, np.device, CHAR(np.status), CHAR(np.allocated), CHAR(np.size), CHAR(np.modtime), CHAR(np.modby), np.modwith FROM nfsphys np, machine m",
     ganf_fields,
     9,
     "m.mach_id = np.mach_id",
@@ -3021,7 +3029,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "np",
     "nfsphys",
-    "m.name, np.dir, np.device, CHAR(np.status), CHAR(np.allocated), CHAR(np.size), CHAR(np.modtime), CHAR(np.modby), np.modwith FROM nfsphys np, machine m",
+    "CHAR(m.name), np.dir, np.device, CHAR(np.status), CHAR(np.allocated), CHAR(np.size), CHAR(np.modtime), CHAR(np.modby), np.modwith FROM nfsphys np, machine m",
     gnfp_fields,
     9,
     "np.mach_id = %d AND np.dir = '%s' AND m.mach_id = np.mach_id",
@@ -3096,10 +3104,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "q",
     QUOTA,
-    "fs.label, q.type, CHAR(q.entity_id), CHAR(q.quota), CHAR(q.phys_id), m.name, CHAR(q.modtime), CHAR(q.modby), q.modwith FROM quota q, filesys fs, machine m",
+    "CHAR(fs.label), q.type, CHAR(q.entity_id), CHAR(q.quota), CHAR(q.phys_id), CHAR(m.name), CHAR(q.modtime), CHAR(q.modby), q.modwith FROM quota q, filesys fs, machine m",
     gqot_fields,
     9,
-    "fs.label = '%s' AND q.type = '%s' AND q.entity_id = %d AND fs.filsys_id = q.filsys_id AND m.mach_id = fs.mach_id",
+    "fs.label LIKE '%s' ESCAPE '*' AND q.type = '%s' AND q.entity_id = %d AND fs.filsys_id = q.filsys_id AND m.mach_id = fs.mach_id",
     3,
     &gqot_validate,
   },
@@ -3111,10 +3119,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "q",
     QUOTA,
-    "fs.label, q.type, CHAR(q.entity_id), CHAR(q.quota), CHAR(q.phys_id), m.name, CHAR(q.modtime), CHAR(q.modby), q.modwith FROM quota q, filesys fs, machine m",
+    "CHAR(fs.label), q.type, CHAR(q.entity_id), CHAR(q.quota), CHAR(q.phys_id), CHAR(m.name), CHAR(q.modtime), CHAR(q.modby), q.modwith FROM quota q, filesys fs, machine m",
     gqbf_fields,
     9,
-    "fs.label = '%s' AND fs.filsys_id = q.filsys_id AND m.mach_id = fs.mach_id",
+    "fs.label LIKE '%s' ESCAPE '*' AND fs.filsys_id = q.filsys_id AND m.mach_id = fs.mach_id",
     1,
     &gqbf_validate,
   },
@@ -3171,7 +3179,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "q",
     QUOTA,
-    "fs.label, u.login, CHAR(q.quota), CHAR(q.phys_id), m.name, CHAR(q.modtime), CHAR(q.modby), q.modwith FROM quota q, filesys fs, users u, machine m",
+    "CHAR(fs.label), CHAR(u.login), CHAR(q.quota), CHAR(q.phys_id), CHAR(m.name), CHAR(q.modtime), CHAR(q.modby), q.modwith FROM quota q, filesys fs, users u, machine m",
     gnfq_fields,
     8,
     "fs.label = '%s' AND q.type = 'USER' AND q.entity_id = u.users_id AND fs.filsys_id = q.filsys_id AND m.mach_id = fs.mach_id AND u.login = '%s'",
@@ -3186,7 +3194,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "q",
     QUOTA,
-    "fs.label, u.login, CHAR(q.quota), np.dir, m.name FROM quota q, filesys fs, users u, nfsphys np, machine m",
+    "CHAR(fs.label), CHAR(u.login), CHAR(q.quota), np.dir, CHAR(m.name) FROM quota q, filesys fs, users u, nfsphys np, machine m",
     gnqp_fields,
     5,
     "np.mach_id = %d AND np.dir = '%s' AND q.phys_id = np.nfsphys_id AND fs.filsys_id = q.filsys_id AND q.type = 'USER' AND u.users_id = q.entity_id AND m.mach_id = np.mach_id",
@@ -3261,10 +3269,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "l",
     LIST,
-    "l.name FROM list l",
+    "CHAR(name) FROM list",
     glin_fields,
     1,
-    "l.name = '%s' AND l.list_id != 0",
+    "name LIKE '%s' ESCAPE '*' AND list_id != 0",
     1,
     0
   },
@@ -3294,7 +3302,7 @@ struct query Queries2[] = {
     "list SET name='%s', active=%s, publicflg=%s, hidden=%s, maillist=%s, grouplist=%s, gid=%s, acl_type='%s', acl_id=%d, description='%s'",
     ulis_fields,
     10,
-    "list.list_id = %d",
+    "list_id = %d",
     1,
     &ulis_validate,
   },
@@ -3383,7 +3391,7 @@ struct query Queries2[] = {
     "imembers",
     (char *)0,
     gmol_fields,
-    0,
+    2,
     (char *)0,
     1,
     &gmol_validate,
@@ -3426,10 +3434,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "z",
     "zephyr",
-    "class, xmt_type, CHAR(xmt_id),sub_type, CHAR(sub_id),iws_type, CHAR(iws_id),iui_type, CHAR(iui_id), CHAR(modtime), CHAR(modby), modwith FROM zephyr",
+    "CHAR(class), xmt_type, CHAR(xmt_id),sub_type, CHAR(sub_id),iws_type, CHAR(iws_id),iui_type, CHAR(iui_id), CHAR(modtime), CHAR(modby), modwith FROM zephyr",
     gzcl_fields,
     12,
-    "class = '%s'",
+    "class LIKE '%s' ESCAPE '*'",
     1,
     &gzcl_validate,
   },    
@@ -3459,7 +3467,7 @@ struct query Queries2[] = {
     "zephyr SET class = '%s', xmt_type = '%d', xmt_id = %d, sub_type = '%s', sub_id = %d, iws_type = '%s', iws_id = %d, iui_type = '%s', iui_id = %d",
     uzcl_fields,
     9,
-    "class = '%s'",
+    "class LIKE '%s' ESCAPE '*'",
     1,
     &uzcl_validate,
   },    
@@ -3474,7 +3482,7 @@ struct query Queries2[] = {
     0,
     uzcl_fields,
     0,
-    "class = '%s'",
+    "class LIKE '%s' ESCAPE '*'",
     1,
     &dzcl_validate,
   },    
@@ -3486,10 +3494,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "s",
     "services",
-    "name, protocol, CHAR(port), description, CHAR(modtime), CHAR(modby), modwith FROM services",
+    "CHAR(name), protocol, CHAR(port), description, CHAR(modtime), CHAR(modby), modwith FROM services",
     gsvc_fields,
     7,
-    "name = '%s'",
+    "name LIKE '%s' ESCAPE '*'",
     1,
     &VDsortf,
   },
@@ -3519,7 +3527,7 @@ struct query Queries2[] = {
     0,
     asvc_fields,
     0,
-    "name = '%s'",
+    "name LIKE '%s' ESCAPE '*'",
     1,
     &asvc_validate,
   },
@@ -3531,10 +3539,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "p",
     "printcap",
-    "p.name, m.name, p.dir, p.rp, CHAR(p.quotaserver), CHAR(p.auth), CHAR(p.price), p.comments, CHAR(p.modtime), CHAR(p.modby), p.modwith FROM printcap p, machine m",
+    "CHAR(p.name), CHAR(m.name), p.dir, p.rp, CHAR(p.quotaserver), CHAR(p.auth), CHAR(p.price), p.comments, CHAR(p.modtime), CHAR(p.modby), p.modwith FROM printcap p, machine m",
     gpce_fields,
     11,
-    "p.name = '%s' AND m.mach_id = p.mach_id",
+    "p.name LIKE '%s' ESCAPE '*' AND m.mach_id = p.mach_id",
     1,
     &gpce_validate,
   },
@@ -3564,7 +3572,7 @@ struct query Queries2[] = {
     0,
     apce_fields,
     0,
-    "name = '%s'",
+    "name LIKE '%s' ESCAPE '*'",
     1,
     &dpce_validate,
   },
@@ -3576,10 +3584,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "p",
     "printcap",
-    "p.name, m.name, p.dir, p.rp, p.comments, CHAR(p.modtime), CHAR(p.modby), p.modwith FROM printcap p, machine m",
+    "CHAR(p.name), CHAR(m.name), p.dir, p.rp, p.comments, CHAR(p.modtime), CHAR(p.modby), p.modwith FROM printcap p, machine m",
     gpcp_fields,
     8,
-    "p.name = '%s' AND m.mach_id = p.mach_id",
+    "p.name LIKE '%s' ESCAPE '*' AND m.mach_id = p.mach_id",
     1,
     &VDsortf,
   },
@@ -3594,7 +3602,7 @@ struct query Queries2[] = {
     0,
     apce_fields,
     0,
-    "name = '%s'",
+    "name LIKE '%s' ESCAPE '*'",
     1,
     &dpce_validate,
   },
@@ -3606,10 +3614,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "p",
     "palladium",
-    "p.name, CHAR(p.ident), m.name, CHAR(p.modtime), CHAR(p.modby), p.modwith FROM palladium p, machine m",
+    "CHAR(p.name), CHAR(p.ident), CHAR(m.name), CHAR(p.modtime), CHAR(p.modby), p.modwith FROM palladium p, machine m",
     gpdm_fields,
     6,
-    "p.name = '%s' AND m.mach_id = p.mach_id",
+    "p.name LIKE '%s' ESCAPE '*' AND m.mach_id = p.mach_id",
     1,
     &VDsortf,
   },
@@ -3639,7 +3647,7 @@ struct query Queries2[] = {
     0,
     apdm_fields,
     0,
-    "name = '%s'",
+    "name LIKE '%s' ESCAPE '*'",
     1,
     &dpdm_validate,
   },
@@ -3651,10 +3659,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "a",
     "alias",
-    "name, type, trans FROM alias",
+    "CHAR(name), CHAR(type), CHAR(trans) FROM alias",
     gali_fields,
     3,
-    "name = '%s' AND type = '%s' AND trans = '%s'",
+    "name LIKE '%s' ESCAPE '*' AND type LIKE '%s' ESCAPE '*' AND trans LIKE '%s' ESCAPE '*'",
     3,
     0,
   },
@@ -3684,7 +3692,7 @@ struct query Queries2[] = {
     (char *)0,
     aali_fields,
     0,
-    "name = '%s' AND type = '%s' AND trans = '%s'",
+    "name LIKE '%s' ESCAPE '*' AND type LIKE '%s' ESCAPE '*' AND trans LIKE '%s' ESCAPE '*'", 
     3,
     &dali_validate,
   },
@@ -3699,7 +3707,7 @@ struct query Queries2[] = {
     "CHAR(value) FROM numvalues",
     gval_fields,
     1,
-    "name = '%s'",
+    "name LIKE '%s' ESCAPE '*'",
     1,
     &gval_validate,
   },
@@ -3729,7 +3737,7 @@ struct query Queries2[] = {
     "numvalues SET value = %s",
     aval_fields,
     1,
-    "name = '%s'",
+    "name LIKE '%s' ESCAPE '*'",
     1,
     &aval_validate,
   },
@@ -3744,7 +3752,7 @@ struct query Queries2[] = {
     (char *)0,
     dval_fields,
     0,
-    "name = '%s'",
+    "name LIKE '%s' ESCAPE '*'",
     1,
     &aval_validate,
   },
@@ -3756,7 +3764,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "tbs",
     "tblstats",
-    "tbs.table_name, CHAR(tbs.appends), CHAR(tbs.updates), CHAR(tbs.deletes), CHAR(tbs.modtime) FROM tblstats tbs",
+    "table_name, CHAR(appends), CHAR(updates), CHAR(deletes), CHAR(modtime) FROM tblstats",
     gats_fields,
     5,
     (char *)0,