lint

[moira.git] / server / queries2.c

diff --git a/server/queries2.c b/server/queries2.c
index 757e06d50c2fa024c92badaebb0f1b61293ecc06..c27fd34bb9c3c6450cbcb36d6020a19d710eac56 100644 (file)
--- a/server/queries2.c
+++ b/server/queries2.c
@@ -32,6 +32,7 @@ int setup_dusr();
 int setup_spop();
 int setup_dpob();
 int setup_dmac();
+int setup_dsnet();
 int setup_dclu();
 int setup_alis();
 int setup_dlis();
@@ -45,6 +46,7 @@ int setup_dnfp();
 int setup_dqot();
 int setup_sshi();
 int setup_akum();
+int setup_dsnt();
 
 /* Query Followup Routines */
 int followup_fix_modby();
@@ -52,12 +54,14 @@ int followup_ausr();
 int followup_gpob();
 int followup_glin();
 int followup_aqot();
+int followup_dqot();
 int followup_gzcl();
 int followup_gsha();
 int followup_gqot();
 int followup_gpce();
 int followup_guax();
 int followup_uuac();
+int followup_gsnt();
 
 int set_modtime();
 int set_modtime_by_id();
@@ -86,6 +90,7 @@ int trigger_dcm();
 int count_members_of_list();
 int get_lists_of_member();
 int register_user();
+int _sdl_followup();
 
 
 \f
@@ -96,6 +101,7 @@ int register_user();
 
 static char ACE_NAME[] = "ace_name";
 static char ACE_TYPE[] = "ace_type";
+static char ADDRESS[] = "address";
 static char CLASS[] = "class";
 static char CLU_ID[] = "clu_id";
 static char CLUSTER[] = "cluster";
@@ -126,6 +132,8 @@ static char SECURE[] = "secure";
 static char SERVICE[] = "service";
 static char SHELL[] = "shell";
 static char SIGNATURE[] = "signature";
+static char SNET_ID[] = "snet_id";
+static char SUBNET[] = "subnet";
 static char STATUS[] = "status";
 static char TYPE[] = "type";
 static char USERS[] = "users";
@@ -336,6 +344,19 @@ static char *guan_fields[] = {
   MIT_ID, CLASS, COMMENTS, SIGNATURE, SECURE, MOD1, MOD2, MOD3,
 };
 
+static struct validate guan_validate = 
+{
+  VOwild01sort01,
+  4,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  followup_guax,
+};
+
 static char *guac_fields[] = {
   CLASS,
   LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, STATUS,
@@ -418,7 +439,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 +451,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,26 +616,26 @@ 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,
   setup_akum,
-  0
-    };
+  0,
+};
 
 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,
   0,
-  0
-    };
+  0,
+};
 
 static char *gfbl_fields[] = {
   LOGIN,
@@ -755,7 +776,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,
@@ -808,6 +829,100 @@ static struct validate dmac_validate = {
   0,
 };
 
+static char *gsnt_fields[] = {
+    NAME,
+    NAME, DESC, ADDRESS, "mask", "low", "high", ACE_TYPE, ACE_NAME,
+    MOD1, MOD2, MOD3
+};
+
+static struct valobj gsnt_valobj[] = {
+  {V_UPWILD, 0},
+  {V_SORT, 0},
+};
+
+static struct validate gsnt_validate = {
+  gsnt_valobj,
+  2,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  followup_gsnt,
+};
+
+static char *asnt_fields[] = {
+    NAME, DESC, ADDRESS, "mask", "low", "high", ACE_TYPE, ACE_NAME,
+};
+
+static struct valobj asnt_valobj[] = {
+  {V_LOCK, 0, SUBNET, 0, SNET_ID, MR_DEADLOCK},
+  {V_CHAR, 0},
+  {V_TYPE, 6, ACE_TYPE, 0, 0, MR_ACE},
+  {V_TYPEDATA, 7, 0, 0, LIST_ID, MR_ACE},
+};
+
+static struct validate asnt_validate = 
+{
+    asnt_valobj,
+    4,
+    NAME,
+    "name = uppercase(LEFT('%s',SIZE(name)))",
+    1,
+    SNET_ID,
+    0,
+    prefetch_value,
+    set_uppercase_modtime,
+};
+
+static char *usnt_fields[] = {
+    NAME,
+    "newname", DESC, ADDRESS, "mask", "low", "high", ACE_TYPE, ACE_NAME,
+};
+
+static struct valobj usnt_valobj[] = {
+  {V_LOCK, 0, SUBNET, 0, SNET_ID, MR_DEADLOCK},
+  {V_ID, 0, SUBNET, NAME, SNET_ID, MR_NO_MATCH},
+  {V_RENAME, 1, SUBNET, NAME, SNET_ID, MR_NOT_UNIQUE},
+  {V_TYPE, 7, ACE_TYPE, 0, 0, MR_ACE},
+  {V_TYPEDATA, 8, 0, 0, LIST_ID, MR_ACE},
+};
+
+static struct validate usnt_validate = 
+{
+    usnt_valobj,
+    5,
+    NAME,
+    "snet_id = %d",
+    1,
+    SNET_ID,
+    0,
+    0,
+    set_modtime_by_id,
+};
+
+static char *dsnt_fields[] = {
+  NAME,
+};
+
+static struct valobj dsnt_valobj[] = {
+  {V_LOCK, 0, SUBNET, 0, SNET_ID, MR_DEADLOCK},
+  {V_ID, 0, SUBNET, NAME, SNET_ID, MR_MACHINE},
+};
+
+static struct validate dsnt_validate = {
+  dsnt_valobj,
+  2,
+  0,
+  0,
+  0,
+  0,
+  0,
+  setup_dsnt,
+  0,
+};
+
 static char *gclu_fields[] = {
   NAME,
   NAME, DESC, LOCATION, MOD1, MOD2, MOD3, 
@@ -900,7 +1015,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 +1044,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 +1063,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 +1137,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 +1149,7 @@ static struct validate rsve_validate = {
   asin_valobj,
   1,
   NAME,
-  "ss.name = uppercase('%s')",
+  "name = uppercase('%s')",
   1,
   0,
   access_service,
@@ -1050,7 +1165,7 @@ static struct validate ssif_validate = {
   asin_valobj,
   1,
   NAME,
-  "ss.name = uppercase('%s')",
+  "name = uppercase('%s')",
   1,
   0,
   0,
@@ -1066,7 +1181,7 @@ static struct validate dsin_validate = {
   asin_valobj,
   1,
   NAME,
-  "ss.name = uppercase('%s')",
+  "name = uppercase('%s')",
   1,
   0,
   0,
@@ -1138,7 +1253,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 +1266,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 +1279,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 +1289,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 +1319,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 +1360,7 @@ static struct validate asha_validate =
   asha_valobj,
   3,
   MACH_ID,
-  "ha.mach_id = %d",
+  "mach_id = %d",
   1,
   MACH_ID,
   0,
@@ -1350,7 +1465,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 +1494,7 @@ static struct validate ufil_validate = {
   ufil_valobj,
   9,
   LABEL,
-  "fs.filsys_id = %d",
+  "filsys_id = %d",
   1,
   FILSYS_ID,
   0,
@@ -1400,7 +1515,7 @@ static struct validate dfil_validate = {
   dfil_valobj,
   2,
   "label",
-  "fs.filsys_id = %d",
+  "filsys_id = %d",
   1,
   0,
   0,
@@ -1440,7 +1555,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 +1598,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 +1610,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 +1630,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,
@@ -1529,6 +1644,7 @@ static char *gqot_fields[] = {
 };
 
 static struct valobj gqot_valobj[] = {
+  {V_WILD, 0},
   {V_TYPE, 1, QUOTA_TYPE, 0, 0, MR_TYPE},
   {V_TYPEDATA, 2, 0, 0, 0, MR_ACE},
   {V_SORT, 0, 0, 0, 0, 0},
@@ -1536,7 +1652,7 @@ static struct valobj gqot_valobj[] = {
 
 static struct validate gqot_validate = {
   gqot_valobj,
-  3,
+  4,
   0,
   0,
   0,
@@ -1552,8 +1668,8 @@ static char *gqbf_fields[] = {
 };
 
 static struct validate gqbf_validate = {
-  VOsort0,
-  1,
+  VOwild0sort,
+  2,
   0,
   0,
   0,
@@ -1578,7 +1694,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 +1706,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,12 +1718,12 @@ 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,
   setup_dqot,
-  0,
+  followup_dqot,
 };
 
 static char *gnfq_fields[] = {
@@ -1647,9 +1763,9 @@ 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, /* object ? */
   0,
   prefetch_filesys,
   followup_aqot,
@@ -1659,7 +1775,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,12 +1787,12 @@ 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,
   setup_dqot,
-  0,
+  followup_dqot,
 };
 
 static char *glin_fields[] = {
@@ -1713,7 +1829,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 +1855,7 @@ static struct validate ulis_validate = {
   ulis_valobj,
   5,
   NAME,
-  "l.list_id = %d",
+  "list_id = %d",
   1,
   LIST_ID,
   access_list,
@@ -1755,7 +1871,7 @@ static struct validate dlis_validate = {
   VOlist0,
   1,
   NAME,
-  "l.list_id = %d",
+  "list_id = %d",
   1,
   0,
   access_list,
@@ -1955,7 +2071,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 +2100,7 @@ static struct validate uzcl_validate = {
   uzcl_valobj,
   9,
   CLASS,
-  "z.class = '%s'",
+  "class = '%s'",
   1,
   0,
   0,
@@ -2017,7 +2133,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 +2176,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 +2188,7 @@ static struct validate dpce_validate = {
   0,
   0,
   NAME,
-  "pc.name = '%s'",
+  "name = '%s'",
   1,
   0,
   0,
@@ -2104,7 +2220,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 +2232,7 @@ static struct validate dpdm_validate = {
   0,
   0,
   NAME,
-  "pal.name = '%s'",
+  "name = '%s'",
   1,
   0,
   0,
@@ -2209,6 +2325,23 @@ static char *gats_fields[] = {
   "table_name", "appends", "updates", "deletes", MOD1, MOD2, MOD3,
 };
 
+static char *_sdl_fields[] = {
+    "level",
+};
+
+static struct validate _sdl_validate = 
+{
+    0,
+    0,
+    (char *)0,
+    (char *)0,
+    0,
+    0,
+    0,
+    0,
+    _sdl_followup,
+};
+
 
 \f
 /* Generalized Query Definitions */
@@ -2255,7 +2388,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,
-    "CHAR(u.login), CHAR(u.uid), u.shell, CHAR(u.last), CHAR(u.first), u.middle, CHAR(u.status), CHAR(u.clearid), u.type, str.string, CHAR(u.signature), CHAR(u.secure), CHAR(u.modtime), CHAR(u.modby), u.modwith FROM users u, strings str",
+    "CHAR(u.login), CHAR(u.uid), u.shell, CHAR(u.last), CHAR(u.first), u.middle, CHAR(u.status), CHAR(u.clearid), u.type, CHAR(str.string), CHAR(u.signature), CHAR(u.secure), CHAR(u.modtime), CHAR(u.modby), u.modwith FROM users u, strings str",
     gual_fields,
     15,
     "u.login LIKE '%s' ESCAPE '*' AND u.users_id != 0 AND u.comment = str.string_id",
@@ -2270,7 +2403,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,
-    "CHAR(u.login), CHAR(u.uid), u.shell, CHAR(u.last), CHAR(u.first), u.middle, CHAR(u.status), CHAR(u.clearid), u.type, str.string, CHAR(u.signature), CHAR(u.secure), CHAR(u.modtime), CHAR(u.modby), u.modwith FROM users u, strings str",
+    "CHAR(u.login), CHAR(u.uid), u.shell, CHAR(u.last), CHAR(u.first), u.middle, CHAR(u.status), CHAR(u.clearid), u.type, CHAR(str.string), CHAR(u.signature), CHAR(u.secure), CHAR(u.modtime), CHAR(u.modby), u.modwith FROM users u, strings str",
     guau_fields,
     15,
     "u.uid = %s AND u.users_id != 0 AND u.comment = str.string_id",
@@ -2285,12 +2418,12 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,
-    "CHAR(u.login), CHAR(u.uid), u.shell, CHAR(u.last), CHAR(u.first), u.middle, CHAR(u.status), CHAR(u.clearid), u.type, str.string, CHAR(u.signature), CHAR(u.secure), CHAR(u.modtime), CHAR(u.modby), u.modwith FROM users u, strings str",
+    "CHAR(u.login), CHAR(u.uid), u.shell, CHAR(u.last), CHAR(u.first), u.middle, CHAR(u.status), CHAR(u.clearid), u.type, CHAR(str.string), CHAR(u.signature), CHAR(u.secure), CHAR(u.modtime), CHAR(u.modby), u.modwith FROM users u, strings str",
     guan_fields,
     15,
     "u.first LIKE '%s' ESCAPE '*' AND u.last LIKE '%s' ESCAPE '*' AND u.users_id != 0 and u.comment = str.string_id",
     2,
-    &VDwild2sortf,
+    &guan_validate,
   },
   
   {
@@ -2300,7 +2433,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,
-    "CHAR(u.login), CHAR(u.uid), u.shell, CHAR(u.last), CHAR(u.first), u.middle, CHAR(u.status), CHAR(u.clearid), u.type, str.string, CHAR(u.signature), CHAR(u.secure), CHAR(u.modtime), CHAR(u.modby), u.modwith FROM users u, strings str",
+    "CHAR(u.login), CHAR(u.uid), u.shell, CHAR(u.last), CHAR(u.first), u.middle, CHAR(u.status), CHAR(u.clearid), u.type, CHAR(str.string), CHAR(u.signature), CHAR(u.secure), CHAR(u.modtime), CHAR(u.modby), u.modwith FROM users u, strings str",
     guac_fields,
     15,
     "u.type = uppercase('%s') AND u.users_id != 0 AND u.comment = str.string_id",
@@ -2315,7 +2448,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,
-    "CHAR(u.login), CHAR(u.uid), u.shell, CHAR(u.last), CHAR(u.first), u.middle, CHAR(u.status), CHAR(u.clearid), u.type, str.string, CHAR(u.signature), CHAR(u.secure), CHAR(u.modtime), CHAR(u.modby), u.modwith FROM users u, strings str",
+    "CHAR(u.login), CHAR(u.uid), u.shell, CHAR(u.last), CHAR(u.first), u.middle, CHAR(u.status), CHAR(u.clearid), u.type, CHAR(str.string), CHAR(u.signature), CHAR(u.secure), CHAR(u.modtime), CHAR(u.modby), u.modwith FROM users u, strings str",
     guam_fields,
     15,
     "u.clearid LIKE '%s' ESCAPE '*' AND u.users_id != 0 AND u.comment = str.string_id",
@@ -2510,7 +2643,7 @@ struct query Queries2[] = {
     UPDATE,
     "u",
     USERS,
-    "secure = %s",
+    "users SET secure = %s",
     uuss_fields,
     1,
     "users_id = %d",
@@ -2555,7 +2688,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",
@@ -2788,6 +2921,66 @@ struct query Queries2[] = {
     &dmac_validate,
   },
 
+  {
+    /* Q_GSNT - GET_SUBNET */
+    "get_subnet",
+    "gsnt",
+    RETRIEVE,
+    "s",
+    SUBNET,
+    "CHAR(s.name), CHAR(s.description), CHAR(s.saddr), CHAR(s.mask), CHAR(s.low), CHAR(s.high), s.owner_type, CHAR(s.owner_id), CHAR(s.modtime), CHAR(s.modby), s.modwith FROM subnet s",
+    gsnt_fields,
+    11,
+    "s.name LIKE '%s' ESCAPE '*' and s.snet_id != 0",
+    1,
+    &gsnt_validate,
+  },
+
+  {
+    /* Q_ASNT - ADD_SUBNET */
+    "add_subnet",
+    "asnt",
+    APPEND,
+    "s",
+    SUBNET,
+    "INTO subnet (name, description, saddr, mask, low, high, owner_type, owner_id, snet_id) VALUES (uppercase('%s'), '%s', %s, %s, %s, %s, '%s', %d, %s)",
+    asnt_fields,
+    8,
+    0,
+    0,
+    &asnt_validate,
+  },
+
+  {
+    /* Q_USNT - UPDATE_SUBNET */
+    "update_subnet",
+    "usnt",
+    UPDATE,
+    "s",
+    SUBNET,
+    "subnet SET name=uppercase('%s'), description='%s', saddr=%s, mask=%s, low=%s, high=%s, owner_type='%s', owner_id=%d",
+    usnt_fields,
+    8,
+    "snet_id = %d",
+    1,
+    &usnt_validate,
+  },
+
+  {
+    /* Q_DSNT - DELETE_SUBNET */
+    "delete_subnet",
+    "dsnt",
+    DELETE,
+    "s",
+    SUBNET,
+    (char *)0,
+    dsnt_fields,
+    0,
+    "snet_id = %d",
+    1,
+    &dsnt_validate,
+  },
+
   {
     /* Q_GCLU - GET_CLUSTER */
     "get_cluster",
@@ -3059,11 +3252,11 @@ struct query Queries2[] = {
   },
 
   {
-    /* Q_QGSV - QUALIFIED_GET_SERVER_HOST */
+    /* Q_QGSH - QUALIFIED_GET_SERVER_HOST */
     "qualified_get_server_host",
     "qgsh",
     RETRIEVE,
-    "sh",
+    0,
     "serverhosts",
     0,
     qgsh_fields,
@@ -3455,8 +3648,8 @@ struct query Queries2[] = {
     UPDATE,
     "np",
     "nfsphys",
-    "nfsphys SET device = '%s', status = '%s', allocated = %s, partsize = %s",
-    gnfp_fields,
+    "nfsphys SET device = '%s', status = %s, allocated = %s, partsize = %s",
+    ganf_fields,
     4,
     "mach_id = %d AND dir = '%s'", 
     2,
@@ -3524,15 +3717,15 @@ struct query Queries2[] = {
   },
 
   {
-    /* Q_AQOT - ADD_QUOTA */ /* prefetch_filsys() gets last 2 values */
+    /* Q_AQOT - ADD_QUOTA */ /* prefetch_filsys() gets last 1 value */
     "add_quota",
     "aqot",
     APPEND,
-    "q",
+    0,
     QUOTA,
-    "INTO quota (type, entity_id, quota, filsys_id, phys_id) VALUES ('%s', %d, %s, %s, %s)",
+    "INTO quota (filsys_id, type, entity_id, quota, phys_id) VALUES ('%s', %d, %d, %s, %s)",
     aqot_fields,
-    3,
+    4,
     (char *)0,
     0,
     &aqot_validate,
@@ -3543,12 +3736,12 @@ struct query Queries2[] = {
     "update_quota",
     "uqot",
     UPDATE,
-    "q",
+    0,
     QUOTA,
     "quota SET quota = %s",
     aqot_fields,
     1,
-    "q.filsys_id = %d AND q.type = '%s' AND q.entity_id = %d",
+    0,
     3,
     &uqot_validate,
   },
@@ -3558,12 +3751,12 @@ struct query Queries2[] = {
     "delete_quota",
     "dqot",
     DELETE,
-    "q",
+    0,
     QUOTA,
     (char *)0,
     aqot_fields,
     0,
-    "q.filsys_id = %d AND q.type = '%s' AND q.entity_id = %d",
+    0,
     3,
     &dqot_validate,
   },
@@ -3599,31 +3792,31 @@ struct query Queries2[] = {
   },
 
   {
-    /* Q_ANFQ - ADD_NFS_QUOTA */ /* prefetch_filsys() gets last 2 values */
+    /* Q_ANFQ - ADD_NFS_QUOTA */ /* prefetch_filsys() gets last 1 value */
     "add_nfs_quota",
     "anfq",
     APPEND,
-    "q",
+    0,
     QUOTA,
-    "INTO quota (type, entity_id, quota, filsys_id, phys_id) VALUES ('USER', %d, %s, %s, %s)",
+    "INTO quota (type, filsys_id, entity_id, quota, phys_id ) VALUES ('USER', %d, %d, %s, %s)",
     anfq_fields,
-    2,
+    3,
     (char *)0,
     0,
     &anfq_validate,
   },
 
   {
-    /* Q_UNFQ - UPDATE_NFS_QUOTA */
+    /* Q_UNFQ - UPDATE_NFS_QUOTA */ 
     "update_nfs_quota",
     "unfq",
     UPDATE,
-    "q",
+    0,
     QUOTA,
     "quota SET quota = %s",
     anfq_fields,
     1,
-    "filsys_id = %d AND type = 'USER' AND entity_id = %d",
+    0,
     2,
     &unfq_validate,
   },
@@ -3633,12 +3826,12 @@ struct query Queries2[] = {
     "delete_nfs_quota",
     "dnfq",
     DELETE,
-    "q",
+    0,
     QUOTA,
     (char *)0,
     anfq_fields,
     0,
-    "filsys_id = %d AND type = 'USER' AND entity_id = %d",
+    0,
     2,
     &dnfq_validate,
   },
@@ -3875,7 +4068,7 @@ struct query Queries2[] = {
     UPDATE,
     "z",
     "zephyr",
-    "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",
+    "zephyr SET class = '%s', xmt_type = '%s', 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'",
@@ -4183,6 +4376,21 @@ struct query Queries2[] = {
     0,
   },
 
+  {
+    /* Q__SDL - _SET_DEBUG_LEVEL */
+    "_set_debug_level",
+    "_sdl",
+    UPDATE,
+    (char *)0,
+    (char *)0,
+    (char *)0,
+    _sdl_fields,
+    1,
+    (char *)0,
+    0,
+    &_sdl_validate,
+  },
+
 };
 
 int QueryCount2 = (sizeof Queries2 / sizeof (struct query));