X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/76f86976ae5273a7b66d9ddda3816ed1f63e0a59..bb00a8d1def8cacd5b32cd9d60d50121041f421a:/server/queries2.c diff --git a/server/queries2.c b/server/queries2.c index 5aee1b5a..3c9baadd 100644 --- a/server/queries2.c +++ b/server/queries2.c @@ -23,6 +23,9 @@ int access_member(); int access_qgli(); int access_service(); int access_filesys(); +int access_host(); +int access_ahal(); +int access_snt(); /* Query Setup Routines */ int prefetch_value(); @@ -32,6 +35,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 +49,9 @@ int setup_dnfp(); int setup_dqot(); int setup_sshi(); int setup_akum(); +int setup_dsnt(); +int setup_ahst(); +int setup_ahal(); /* Query Followup Routines */ int followup_fix_modby(); @@ -52,12 +59,15 @@ 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 followup_ghst(); int set_modtime(); int set_modtime_by_id(); @@ -86,6 +96,7 @@ int trigger_dcm(); int count_members_of_list(); int get_lists_of_member(); int register_user(); +int _sdl_followup(); @@ -96,6 +107,8 @@ int register_user(); static char ACE_NAME[] = "ace_name"; static char ACE_TYPE[] = "ace_type"; +static char ADDRESS[] = "address"; +static char ALIAS[] = "alias"; static char CLASS[] = "class"; static char CLU_ID[] = "clu_id"; static char CLUSTER[] = "cluster"; @@ -126,6 +139,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"; @@ -244,51 +259,51 @@ static struct validate VDsort2= { VOsort01,2 }; static struct validate VDwild2sort2 = { VOwild01sort01,4 }; static struct validate VDwild3sort1 = { VOwild012sort0,4 }; static struct validate VDsortf = { - VOsort0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - followup_fix_modby, + VOsort0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + followup_fix_modby, }; static struct validate VDwildsortf = { - VOwild0sort, - 2, - 0, - 0, - 0, - 0, - 0, - 0, - followup_fix_modby, + VOwild0sort, + 2, + 0, + 0, + 0, + 0, + 0, + 0, + followup_fix_modby, }; static struct validate VDwild2sortf = { - VOwild01sort01, - 4, - 0, - 0, - 0, - 0, - 0, - 0, - followup_fix_modby, + VOwild01sort01, + 4, + 0, + 0, + 0, + 0, + 0, + 0, + followup_fix_modby, }; static struct validate VDupwildsortf = { - VOupwild0sort, - 2, - 0, - 0, - 0, - 0, - 0, - 0, - followup_fix_modby, + VOupwild0sort, + 2, + 0, + 0, + 0, + 0, + 0, + 0, + followup_fix_modby, }; @@ -304,7 +319,7 @@ static char *gual_fields[] = { LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, STATUS, MIT_ID, CLASS, COMMENTS, SIGNATURE, SECURE, MOD1, MOD2, MOD3, }; - + static char *gubl_fields[] = { LOGIN, LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, STATUS, @@ -325,33 +340,46 @@ static struct validate gubl_validate = }; static char *guau_fields[] = { - UID, - LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, STATUS, - MIT_ID, CLASS, COMMENTS, SIGNATURE, SECURE, MOD1, MOD2, MOD3, + UID, + LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, STATUS, + MIT_ID, CLASS, COMMENTS, SIGNATURE, SECURE, MOD1, MOD2, MOD3, }; - + static char *guan_fields[] = { - FIRST, LAST, - LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, STATUS, - MIT_ID, CLASS, COMMENTS, SIGNATURE, SECURE, MOD1, MOD2, MOD3, + FIRST, LAST, + LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, STATUS, + 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, - MIT_ID, CLASS, COMMENTS, SIGNATURE, SECURE, MOD1, MOD2, MOD3, + CLASS, + LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, STATUS, + MIT_ID, CLASS, COMMENTS, SIGNATURE, SECURE, MOD1, MOD2, MOD3, }; - + static char *guam_fields[] = { - MIT_ID, - LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, STATUS, - MIT_ID, CLASS, COMMENTS, SIGNATURE, SECURE, MOD1, MOD2, MOD3, + MIT_ID, + LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, STATUS, + MIT_ID, CLASS, COMMENTS, SIGNATURE, SECURE, MOD1, MOD2, MOD3, }; - + static char *gubu_fields[] = { - UID, - LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, STATUS, - MIT_ID, CLASS, MOD1, MOD2, MOD3, + UID, + LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, STATUS, + MIT_ID, CLASS, MOD1, MOD2, MOD3, }; static struct validate gubu_validate = @@ -375,15 +403,15 @@ static char *gubn_fields[] = { static struct validate gubn_validate = { - VOwild01sort0, - 3, - 0, - 0, - 0, - 0, - 0, - 0, - followup_fix_modby, + VOwild01sort0, + 3, + 0, + 0, + 0, + 0, + 0, + 0, + followup_fix_modby, }; static char *gubc_fields[] = { @@ -418,19 +446,19 @@ static struct validate auac_validate = { auac_valobj, 8, LOGIN, - "users.login = LEFT('%s',SIZE(users.login))", + "login = LEFT('%s',SIZE(login))", 1, USERS_ID, 0, setup_ausr, followup_ausr, }; - + static struct validate ausr_validate = { auac_valobj, 7, LOGIN, - "users.login = LEFT('%s',SIZE(users.login))", + "login = LEFT('%s',SIZE(login))", 1, USERS_ID, 0, @@ -440,7 +468,7 @@ static struct validate ausr_validate = { static char *rusr_fields[] = { UID, LOGIN, "fs_type" -}; + }; static struct valobj rusr_valobj[] = { {V_LOCK, 0, USERS, 0, USERS_ID, MR_DEADLOCK}, @@ -468,29 +496,29 @@ static char *uuac_fields[] = { }; static struct valobj uuac_valobj[] = { - {V_LOCK, 0, USERS, 0, USERS_ID, MR_DEADLOCK}, - {V_ID, 0, USERS, LOGIN, USERS_ID, MR_USER}, - {V_RENAME, 1, USERS, LOGIN, USERS_ID, MR_NOT_UNIQUE}, - {V_CHAR, 4}, - {V_CHAR, 5}, - {V_CHAR, 6}, - {V_CHAR, 8}, - {V_TYPE, 9, CLASS, 0, 0, MR_BAD_CLASS}, - {V_ID, 10, "strings", "string", "string_id", MR_NO_MATCH}, + {V_LOCK, 0, USERS, 0, USERS_ID, MR_DEADLOCK}, + {V_ID, 0, USERS, LOGIN, USERS_ID, MR_USER}, + {V_RENAME, 1, USERS, LOGIN, USERS_ID, MR_NOT_UNIQUE}, + {V_CHAR, 4}, + {V_CHAR, 5}, + {V_CHAR, 6}, + {V_CHAR, 8}, + {V_TYPE, 9, CLASS, 0, 0, MR_BAD_CLASS}, + {V_ID, 10, "strings", "string", "string_id", MR_NO_MATCH}, }; static struct validate uuac_validate = { - uuac_valobj, - 9, - 0, - 0, - 0, - USERS_ID, - 0, - setup_ausr, - followup_uuac, + uuac_valobj, + 9, + 0, + 0, + 0, + USERS_ID, + 0, + setup_ausr, + followup_uuac, }; - + static struct validate uusr_validate = { uuac_valobj, 8, @@ -529,7 +557,7 @@ static char *uuss_fields[] = { LOGIN, SECURE, }; - + static struct validate uust_validate = { VOuser0lock, 2, @@ -563,8 +591,8 @@ static char *dubu_fields[] = { }; static struct valobj dubu_valobj[] = { - {V_LOCK, 0, USERS, 0, USERS_ID, MR_DEADLOCK}, - {V_ID, 0, USERS, UID, USERS_ID, MR_USER} + {V_LOCK, 0, USERS, 0, USERS_ID, MR_DEADLOCK}, + {V_ID, 0, USERS, UID, USERS_ID, MR_USER} }; static struct validate dubu_validate = { @@ -580,40 +608,40 @@ static struct validate dubu_validate = { }; static char *gkum_fields[] = { LOGIN, "kerberos", - LOGIN, "kerberos" }; + LOGIN, "kerberos" }; static char *akum_fields[] = { LOGIN, "kerberos" }; static struct valobj akum_valobj[] = { - {V_ID, 0, USERS, LOGIN, USERS_ID, MR_USER}, - {V_ID, 1, "strings", "string", "string_id", MR_NO_MATCH}, + {V_ID, 0, USERS, LOGIN, USERS_ID, MR_USER}, + {V_ID, 1, "strings", "string", "string_id", MR_NO_MATCH}, }; static struct validate akum_validate = { - akum_valobj, - 1, - USERS_ID, - "krbmap.users_id = %d or krbmap.string_id = %d", - 2, - USERS_ID, - access_user, - setup_akum, - 0 + akum_valobj, + 1, + USERS_ID, + "users_id = %d or string_id = %d", + 2, + USERS_ID, + access_user, + setup_akum, + 0, }; static struct validate dkum_validate = { - akum_valobj, - 2, - USERS_ID, - "krbmap.users_id = %d and krbmap.string_id = %d", - 2, - USERS_ID, - access_user, - 0, - 0 + akum_valobj, + 2, + USERS_ID, + "users_id = %d and string_id = %d", + 2, + USERS_ID, + access_user, + 0, + 0, }; static char *gfbl_fields[] = { @@ -663,7 +691,7 @@ static struct validate gpob_validate = { VOuser0, 1, "potype", - "users.potype != 'NONE' and users.users_id=%d", + "potype != 'NONE' and users_id=%d", 1, 0, access_user, @@ -741,63 +769,105 @@ static char *gmac_fields[] = { NAME, TYPE, MOD1, MOD2, MOD3, }; -static char *amac_fields[] = { - NAME, TYPE +static char *ghst_fields[] = { + NAME, ADDRESS, "location", "contact", + NAME, "vendor", "model", "os", "location", "contact", "use", "status", "status_change", SUBNET, ADDRESS, ACE_TYPE, ACE_NAME, "admin_comment", "ops_comment", "created", "creator", "inuse", MOD1, MOD2, MOD3, +}; + +static struct valobj ghst_valobj[] = { + {V_UPWILD, 0}, + {V_UPWILD, 1}, + {V_UPWILD, 2}, + {V_UPWILD, 3}, + {V_SORT, 0}, +}; + +static struct validate ghst_validate = { + ghst_valobj, + 5, + 0, + 0, + 0, + 0, + access_host, + 0, + followup_ghst, +}; + +static char *ahst_fields[] = { + NAME, "vendor", "model", "os", "location", "contact", "use", "status", SUBNET, ADDRESS, ACE_TYPE, ACE_NAME, "admin_comment", "ops_comment", }; -static struct valobj amac_valobj[] = { +static struct valobj ahst_valobj[] = { {V_CHAR, 0}, + {V_CHAR, 1}, + {V_CHAR, 2}, + {V_CHAR, 3}, + {V_CHAR, 4}, {V_LOCK, 0, MACHINE, 0, MACH_ID, MR_DEADLOCK}, - {V_TYPE, 1, "mac_type", 0, 0, MR_TYPE}, + {V_ID, 8, SUBNET, NAME, SNET_ID, MR_SUBNET}, + {V_TYPE, 10, ACE_TYPE, 0, 0, MR_ACE}, + {V_TYPEDATA, 11, 0, 0, 0, MR_ACE}, + {V_ID, 12, "strings", "string", "string_id", MR_NO_MATCH}, + {V_ID, 13, "strings", "string", "string_id", MR_NO_MATCH}, }; -static struct validate amac_validate = { - amac_valobj, - 3, +static struct validate ahst_validate = { + ahst_valobj, + 11, NAME, - "machine.name = UPPERCASE(LEFT('%s',SIZE(machine.name)))", + "name = uppercase(LEFT('%s',SIZE(name)))", 1, MACH_ID, - 0, - prefetch_value, + access_host, + setup_ahst, set_uppercase_modtime, }; -static char *umac_fields[] = { +static char *uhst_fields[] = { NAME, - "newname", TYPE, + "newname", "vendor", "model", "os", "location", "contact", "use", "status", SUBNET, ADDRESS, ACE_TYPE, ACE_NAME, "admin_comment", "ops_comment", }; -static struct valobj umac_valobj[] = { - {V_LOCK, 0, MACHINE, 0, MACH_ID, MR_DEADLOCK}, +static struct valobj uhst_valobj[] = { + {V_CHAR, 0}, {V_ID, 0, MACHINE, NAME, MACH_ID, MR_MACHINE}, {V_RENAME, 1, MACHINE, NAME, MACH_ID, MR_NOT_UNIQUE}, - {V_TYPE, 2, "mac_type", 0, 0, MR_TYPE}, + {V_CHAR, 2}, + {V_CHAR, 3}, + {V_CHAR, 4}, + {V_CHAR, 5}, + {V_LOCK, 0, MACHINE, 0, MACH_ID, MR_DEADLOCK}, + {V_ID, 9, SUBNET, NAME, SNET_ID, MR_SUBNET}, + {V_TYPE, 11, ACE_TYPE, 0, 0, MR_ACE}, + {V_TYPEDATA, 12, 0, 0, 0, MR_ACE}, + {V_ID, 13, "strings", "string", "string_id", MR_NO_MATCH}, + {V_ID, 14, "strings", "string", "string_id", MR_NO_MATCH}, }; -static struct validate umac_validate = { - umac_valobj, - 4, +static struct validate uhst_validate = { + uhst_valobj, + 13, 0, 0, 0, MACH_ID, - 0, - 0, + access_host, + setup_ahst, set_modtime_by_id, }; -static char *dmac_fields[] = { +static char *dhst_fields[] = { NAME, }; -static struct valobj dmac_valobj[] = { +static struct valobj dhst_valobj[] = { {V_LOCK, 0, MACHINE, 0, MACH_ID, MR_DEADLOCK}, {V_ID, 0, MACHINE, NAME, MACH_ID, MR_MACHINE}, }; -static struct validate dmac_validate = { - dmac_valobj, +static struct validate dhst_validate = { + dhst_valobj, 2, 0, 0, @@ -808,6 +878,159 @@ static struct validate dmac_validate = { 0, }; +static char *ghal_fields[] = { + ALIAS, "canonical_hostname", + ALIAS, "canonical_hostname" +}; + +static struct valobj ghal_valobj[] = { + {V_UPWILD, 0}, + {V_UPWILD, 1}, + {V_SORT, 0}, +}; + +static struct validate ghal_validate = { + ghal_valobj, + 3, + 0, + 0, + 0, + 0, + access_ahal, + 0, + 0, +}; + +static struct valobj ahal_valobj[] = { + {V_CHAR, 0}, + {V_UPWILD, 0}, + {V_ID, 1, MACHINE, NAME, MACH_ID, MR_MACHINE}, +}; + +static struct validate ahal_validate = { + ahal_valobj, + 3, + NAME, + "name = LEFT('%s',SIZE(name))", + 1, + MACH_ID, + access_ahal, + setup_ahal, + 0, +}; + +static struct valobj dhal_valobj[] = { + {V_UPWILD, 0}, + {V_LOCK, 0, MACHINE, 0, MACH_ID, MR_DEADLOCK}, + {V_ID, 1, MACHINE, NAME, MACH_ID, MR_MACHINE}, +}; + +static struct validate dhal_validate = { + dhal_valobj, + 3, + NAME, + "name = LEFT('%s',SIZE(name)) AND mach_id = %d", + 2, + MACH_ID, + access_ahal, + 0, + 0, +}; + +static char *gsnt_fields[] = { + NAME, + NAME, DESC, ADDRESS, "mask", "low", "high", "prefix", 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, + access_snt, + 0, + followup_gsnt, +}; + +static char *asnt_fields[] = { + NAME, DESC, ADDRESS, "mask", "low", "high", "prefix", ACE_TYPE, ACE_NAME, +}; + +static struct valobj asnt_valobj[] = { + {V_LOCK, 0, SUBNET, 0, SNET_ID, MR_DEADLOCK}, + {V_CHAR, 0}, + {V_TYPE, 7, ACE_TYPE, 0, 0, MR_ACE}, + {V_TYPEDATA, 8, 0, 0, 0, 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", "prefix", 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, 8, ACE_TYPE, 0, 0, MR_ACE}, + {V_TYPEDATA, 9, 0, 0, 0, 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_SUBNET}, +}; + +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, @@ -816,7 +1039,7 @@ static char *gclu_fields[] = { static char *aclu_fields[] = { NAME, DESC, LOCATION, }; - + static struct valobj aclu_valobj[] = { {V_LOCK, 0, CLUSTER, 0, CLU_ID, MR_DEADLOCK}, {V_CHAR, 0} @@ -827,7 +1050,7 @@ static struct validate aclu_validate = aclu_valobj, 2, NAME, - "cluster.name = LEFT('%s',SIZE(cluster.name))", + "name = LEFT('%s',SIZE(name))", 1, CLU_ID, 0, @@ -863,15 +1086,15 @@ static char *dclu_fields[] = { }; static struct validate dclu_validate = { - VOclu0, - 1, - 0, - 0, - 0, - 0, - 0, - setup_dclu, - 0, + VOclu0, + 1, + 0, + 0, + 0, + 0, + 0, + setup_dclu, + 0, }; static char *gmcm_fields[] = { @@ -900,7 +1123,7 @@ static struct validate amtc_validate = /* for amtc and dmfc */ amtc_valobj, 2, MACH_ID, - "mcmap.mach_id = %d and mcmap.clu_id = %d", + "mach_id = %d and clu_id = %d", 2, 0, 0, @@ -929,7 +1152,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 +1171,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, @@ -970,20 +1193,20 @@ static struct valobj gsin_valobj[] = static struct validate gsin_validate = { - gsin_valobj, - 1, - 0, - 0, - 0, - 0, - access_service, - 0, - followup_glin, + gsin_valobj, + 1, + 0, + 0, + 0, + 0, + access_service, + 0, + followup_glin, }; static char *qgsv_fields[] = { - "enable", "inprogress", "harderror", - "service", + "enable", "inprogress", "harderror", + "service", }; static struct valobj qgsv_valobj[] = { @@ -993,15 +1216,15 @@ static struct valobj qgsv_valobj[] = { }; static struct validate qgsv_validate = { - qgsv_valobj, - 3, - 0, - 0, - 0, - 0, - 0, - 0, - qualified_get_server, + qgsv_valobj, + 3, + 0, + 0, + 0, + 0, + 0, + 0, + qualified_get_server, }; static char *asin_fields[] = { @@ -1022,7 +1245,7 @@ static struct validate asin_validate = /* for asin, usin */ asin_valobj, 5, NAME, - "servers.name = UPPERCASE(LEFT('%s',SIZE(servers.name)))", + "name = uppercase(LEFT('%s',SIZE(name)))", 1, 0, 0, @@ -1034,7 +1257,7 @@ static struct validate rsve_validate = { asin_valobj, 1, NAME, - "services.name = uppercase('%s')", + "name = uppercase('%s')", 1, 0, access_service, @@ -1050,7 +1273,7 @@ static struct validate ssif_validate = { asin_valobj, 1, NAME, - "services.name = uppercase('%s')", + "name = uppercase('%s')", 1, 0, 0, @@ -1066,7 +1289,7 @@ static struct validate dsin_validate = { asin_valobj, 1, NAME, - "services.name = uppercase('%s')", + "name = uppercase('%s')", 1, 0, 0, @@ -1082,8 +1305,8 @@ static char *gshi_fields[] = { }; static struct valobj gshi_valobj[] = { - { V_UPWILD, 0 }, - { V_UPWILD, 1 }, + { V_UPWILD, 0 }, + { V_UPWILD, 1 }, }; static struct validate gshi_validate = { @@ -1099,8 +1322,8 @@ static struct validate gshi_validate = { }; static char *qgsh_fields[] = { - "service", "enable", "override", "success", "inprogress", "hosterror", - "service", MACHINE, + "service", "enable", "override", "success", "inprogress", "hosterror", + "service", MACHINE, }; static struct valobj qgsh_valobj[] = { @@ -1112,15 +1335,15 @@ static struct valobj qgsh_valobj[] = { }; static struct validate qgsh_validate = { - qgsh_valobj, - 5, - 0, - 0, - 0, - 0, - 0, - 0, - qualified_get_serverhost, + qgsh_valobj, + 5, + 0, + 0, + 0, + 0, + 0, + 0, + qualified_get_serverhost, }; static char *ashi_fields[] = { @@ -1138,7 +1361,7 @@ static struct validate ashi_validate = /* ashi & ushi */ ashi_valobj, 3, SERVICE, - "serverhosts.service = UPPERCASE(LEFT('%s',SIZE(serverhosts.service))) and serverhosts.mach_id = %d", + "service = uppercase(LEFT('%s',SIZE(service))) AND mach_id = %d", 2, 0, access_service, @@ -1151,7 +1374,7 @@ static struct validate rshe_validate = ashi_valobj, 3, SERVICE, - "serverhosts.service = uppercase('%s') and serverhosts.mach_id = %d", + "service = uppercase('%s') AND mach_id = %d", 2, 0, access_service, @@ -1164,7 +1387,7 @@ static struct validate ssho_validate = ashi_valobj, 3, SERVICE, - "serverhosts.service = uppercase('%s') and serverhosts.mach_id = %d", + "service = uppercase('%s') AND mach_id = %d", 2, 0, access_service, @@ -1173,13 +1396,13 @@ static struct validate ssho_validate = }; static char *sshi_fields[] = { - "service", MACHINE, "override", "success", "inprogress", - "hosterror", "errmsg", "ltt", "lts" + "service", MACHINE, "override", "success", "inprogress", + "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 +1427,7 @@ static struct validate dshi_validate = ashi_valobj, 3, SERVICE, - "serverhosts.service = uppercase('%s') and serverhosts.mach_id = %d", + "service = uppercase('%s') AND mach_id = %d", 2, 0, access_service, @@ -1245,7 +1468,7 @@ static struct validate asha_validate = asha_valobj, 3, MACH_ID, - "hostaccess.mach_id = %d", + "mach_id = %d", 1, MACH_ID, 0, @@ -1311,7 +1534,7 @@ static char *gfsp_fields[] = { LABEL, TYPE, MACHINE, NAME, "mount", "access", COMMENTS, "owner", "owners", "create", "lockertype", MOD1, MOD2, MOD3, }; - + static char *gfsg_fields[] = { LIST, LABEL, TYPE, MACHINE, NAME, "mount", "access", COMMENTS, "owner", "owners", @@ -1350,7 +1573,7 @@ static struct validate afil_validate = { afil_valobj, 8, LABEL, - "filesys.label = LEFT('%s',SIZE(filesys.label))", + "label = LEFT('%s',SIZE(label))", 1, FILSYS_ID, 0, @@ -1379,7 +1602,7 @@ static struct validate ufil_validate = { ufil_valobj, 9, LABEL, - "filesys.filsys_id = %d", + "filsys_id = %d", 1, FILSYS_ID, 0, @@ -1400,7 +1623,7 @@ static struct validate dfil_validate = { dfil_valobj, 2, "label", - "filesys.filsys_id = %d", + "filsys_id = %d", 1, 0, 0, @@ -1409,43 +1632,43 @@ static struct validate dfil_validate = { }; static char *gfgm_fields[] = { - "fsgroup", FILESYS, "sortkey" -}; + "fsgroup", FILESYS, "sortkey" + }; static struct valobj gfgm_valobj[] = { - {V_ID, 0, FILESYS, LABEL, FILSYS_ID, MR_FILESYS}, - {V_SORT, 1}, - {V_SORT, 0}, + {V_ID, 0, FILESYS, LABEL, FILSYS_ID, MR_FILESYS}, + {V_SORT, 1}, + {V_SORT, 0}, }; static struct validate gfgm_validate = { - gfgm_valobj, - 3, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + gfgm_valobj, + 3, + 0, + 0, + 0, + 0, + 0, + 0, + 0, }; static struct valobj aftg_valobj[] = { - {V_LOCK, 0, FILESYS, 0, FILSYS_ID, MR_DEADLOCK}, - {V_ID, 0, FILESYS, LABEL, FILSYS_ID, MR_FILESYS}, - {V_ID, 1, FILESYS, LABEL, FILSYS_ID, MR_FILESYS}, + {V_LOCK, 0, FILESYS, 0, FILSYS_ID, MR_DEADLOCK}, + {V_ID, 0, FILESYS, LABEL, FILSYS_ID, MR_FILESYS}, + {V_ID, 1, FILESYS, LABEL, FILSYS_ID, MR_FILESYS}, }; static struct validate aftg_validate = { - aftg_valobj, - 3, - "group_id", - "fsgroup.group_id = %d and fsgroup.filsys_id = %d", - 2, - 0, - 0, - 0, - 0, + aftg_valobj, + 3, + "group_id", + "group_id = %d and filsys_id = %d", + 2, + 0, + 0, + 0, + 0, }; static char *ganf_fields[] = { @@ -1483,7 +1706,7 @@ static struct validate anfp_validate = { anfp_valobj, 2, DIR, - "nfsphys.mach_id = %d and nfsphys.dir = LEFT('%s',SIZE(nfsphys.dir))", + "mach_id = %d and dir = LEFT('%s',SIZE(dir))", 2, "nfsphys_id", 0, @@ -1495,7 +1718,7 @@ static struct validate unfp_validate = { anfp_valobj, 2, DIR, - "nfsphys.mach_id = %d and nfsphys.dir = '%s'", + "mach_id = %d and dir = '%s'", 2, "nfsphys_id", 0, @@ -1515,7 +1738,7 @@ static struct validate dnfp_validate = { VOmach0, 1, DIR, - "nfsphys.mach_id = %d and nfsphys.dir = '%s'", + "mach_id = %d and dir = '%s'", 2, "nfsphys_id", 0, @@ -1529,6 +1752,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 +1760,7 @@ static struct valobj gqot_valobj[] = { static struct validate gqot_validate = { gqot_valobj, - 3, + 4, 0, 0, 0, @@ -1552,8 +1776,8 @@ static char *gqbf_fields[] = { }; static struct validate gqbf_validate = { - VOsort0, - 1, + VOwild0sort, + 2, 0, 0, 0, @@ -1578,7 +1802,7 @@ static struct validate aqot_validate = { aqot_valobj, 4, FILSYS_ID, - "quota.filsys_id = %d and quota.type = '%s' and quota.entity_id = %d", + "filsys_id = %d and type = '%s' and entity_id = %d", 3, 0, 0, @@ -1590,7 +1814,7 @@ static struct validate uqot_validate = { aqot_valobj, 4, FILSYS_ID, - "quota.filsys_id = %d and quota.type = '%s' and quota.entity_id = %d", + "filsys_id = %d AND type = '%s' AND entity_id = %d", 3, 0, 0, @@ -1602,12 +1826,12 @@ static struct validate dqot_validate = { aqot_valobj, 4, FILSYS_ID, - "quota.filsys_id = %d and quota.type = '%s' and quota.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 +1871,9 @@ static struct validate anfq_validate = { VOfilsys0user1, 3, FILSYS_ID, - "quota.filsys_id = %d and quota.type = 'USER' and quota.entity_id = %d", + "filsys_id = %d AND type = 'USER' AND entity_id = %d", 2, - 0, + 0, /* object ? */ 0, prefetch_filesys, followup_aqot, @@ -1659,7 +1883,7 @@ static struct validate unfq_validate = { VOfilsys0user1, 3, FILSYS_ID, - "quota.filsys_id = %d and quota.type = 'USER' and quota.entity_id = %d", + "filsys_id = %d AND type = 'USER' AND entity_id = %d", 2, 0, 0, @@ -1671,12 +1895,12 @@ static struct validate dnfq_validate = { VOfilsys0user1, 3, FILSYS_ID, - "quota.filsys_id = %d and quota.entity_id = %d", + "filsys_id = %d AND entity_id = %d", 2, 0, 0, setup_dqot, - 0, + followup_dqot, }; static char *glin_fields[] = { @@ -1713,7 +1937,7 @@ static struct validate alis_validate = { alis_valobj, 4, NAME, - "list.name = LEFT('%s',SIZE(list.name))", + "name = LEFT('%s',SIZE(name))", 1, LIST_ID, 0, @@ -1739,7 +1963,7 @@ static struct validate ulis_validate = { ulis_valobj, 5, NAME, - "list.list_id = %d", + "list_id = %d", 1, LIST_ID, access_list, @@ -1755,7 +1979,7 @@ static struct validate dlis_validate = { VOlist0, 1, NAME, - "list.list_id = %d", + "list_id = %d", 1, 0, access_list, @@ -1801,8 +2025,8 @@ static struct validate dmfl_validate = }; static char *gaus_fields[] = { - ACE_TYPE, ACE_NAME, - "use_type", "use_name", + ACE_TYPE, ACE_NAME, + "use_type", "use_name", }; static struct valobj gaus_valobj[] = { @@ -1811,20 +2035,20 @@ static struct valobj gaus_valobj[] = { }; static struct validate gaus_validate = { - gaus_valobj, - 2, - 0, - 0, - 0, - 0, - access_member, - 0, - get_ace_use, + gaus_valobj, + 2, + 0, + 0, + 0, + 0, + access_member, + 0, + get_ace_use, }; static char *qgli_fields[] = { - "active", "publicflg", "hidden", "maillist", "grouplist", - "list", + "active", "publicflg", "hidden", "maillist", "grouplist", + "list", }; static struct valobj qgli_valobj[] = { @@ -1836,15 +2060,15 @@ static struct valobj qgli_valobj[] = { }; static struct validate qgli_validate = { - qgli_valobj, - 5, - 0, - 0, - 0, - 0, - access_qgli, - 0, - qualified_get_lists, + qgli_valobj, + 5, + 0, + 0, + 0, + 0, + access_qgli, + 0, + qualified_get_lists, }; static char *gmol_fields[] = { @@ -1875,7 +2099,7 @@ static struct validate geml_validate = { 0, get_end_members_of_list, }; - + static char *glom_fields[] = { "member_type", "member_name", "list_name", "active", "publicflg", "hidden", "maillist", "grouplist", @@ -1917,9 +2141,9 @@ static struct validate cmol_validate = { }; static char *gzcl_fields[] = { - CLASS, - CLASS, "xmt_type", "xmt_name", "sub_type", "sub_name", - "iws_type", "iws_name", "iui_type", "iui_name", MOD1, MOD2, MOD3, + CLASS, + CLASS, "xmt_type", "xmt_name", "sub_type", "sub_name", + "iws_type", "iws_name", "iui_type", "iui_name", MOD1, MOD2, MOD3, }; static struct validate gzcl_validate = { @@ -1935,8 +2159,8 @@ static struct validate gzcl_validate = { }; static char *azcl_fields[] = { - CLASS, "xmt_type", "xmt_name", "sub_type", "sub_name", - "iws_type", "iws_name", "iui_type", "iui_name", + CLASS, "xmt_type", "xmt_name", "sub_type", "sub_name", + "iws_type", "iws_name", "iui_type", "iui_name", }; static struct valobj azcl_valobj[] = { @@ -1955,7 +2179,7 @@ static struct validate azcl_validate = { azcl_valobj, 9, CLASS, - "zephyr.class = LEFT('%s',SIZE(zephyr.class))", + "class = LEFT('%s',SIZE(class))", 1, 0, 0, @@ -1964,8 +2188,8 @@ static struct validate azcl_validate = { }; static char *uzcl_fields[] = { - CLASS, "newclass", "xmt_type", "xmt_name", "sub_type", "sub_name", - "iws_type", "iws_name", "iui_type", "iui_name", + CLASS, "newclass", "xmt_type", "xmt_name", "sub_type", "sub_name", + "iws_type", "iws_name", "iui_type", "iui_name", }; static struct valobj uzcl_valobj[] = { @@ -1984,7 +2208,7 @@ static struct validate uzcl_validate = { uzcl_valobj, 9, CLASS, - "zephyr.class = '%s'", + "class = '%s'", 1, 0, 0, @@ -1996,7 +2220,7 @@ static struct validate dzcl_validate = { 0, 0, CLASS, - "zephyr.class = '%s'", + "class = '%s'", 1, 0, 0, @@ -2006,18 +2230,18 @@ static struct validate dzcl_validate = { static char *gsvc_fields[] = { SERVICE, - SERVICE, "protocol", "port", DESC, MOD1, MOD2, MOD3 + SERVICE, "protocol", "port", DESC, MOD1, MOD2, MOD3, }; static char *asvc_fields[] = { - SERVICE, "protocol", "port", DESC + SERVICE, "protocol", "port", DESC, }; static struct validate asvc_validate = { VOchar0, 1, NAME, - "services.name = LEFT('%s',SIZE(services.name))", + "name = LEFT('%s',SIZE(name))", 1, 0, 0, @@ -2026,10 +2250,10 @@ static struct validate asvc_validate = { }; static char *gpce_fields[] = { - "printer", - "printer", "spooling_host", "spool_directory", "rprinter", - "quotaserver", "authenticate", "price", COMMENTS, - MOD1, MOD2, MOD3, + "printer", + "printer", "spooling_host", "spool_directory", "rprinter", + "quotaserver", "authenticate", "price", COMMENTS, + MOD1, MOD2, MOD3, }; static struct validate gpce_validate = { @@ -2045,22 +2269,22 @@ static struct validate gpce_validate = { }; static char *apce_fields[] = { - "printer", "spooling_host", "spool_directory", "rprinter", - "quotaserver", "authenticate", "price", COMMENTS, - MOD1, MOD2, MOD3, + "printer", "spooling_host", "spool_directory", "rprinter", + "quotaserver", "authenticate", "price", COMMENTS, + MOD1, MOD2, MOD3, }; static struct valobj apce_valobj[] = { - {V_CHAR, 0}, - {V_ID, 1, MACHINE, NAME, MACH_ID, MR_MACHINE}, - {V_ID, 4, MACHINE, NAME, MACH_ID, MR_MACHINE}, + {V_CHAR, 0}, + {V_ID, 1, MACHINE, NAME, MACH_ID, MR_MACHINE}, + {V_ID, 4, MACHINE, NAME, MACH_ID, MR_MACHINE}, }; static struct validate apce_validate = { apce_valobj, 3, NAME, - "printcap.name = LEFT('%s',SIZE(printcap.name))", + "name = LEFT('%s',SIZE(name))", 1, 0, 0, @@ -2072,7 +2296,7 @@ static struct validate dpce_validate = { 0, 0, NAME, - "printcap.name = '%s'", + "name = '%s'", 1, 0, 0, @@ -2081,30 +2305,30 @@ static struct validate dpce_validate = { }; static char *gpcp_fields[] = { - "printer", - "printer", "spooling_host", "spool_directory", "rprinter", COMMENTS, - MOD1, MOD2, MOD3, + "printer", + "printer", "spooling_host", "spool_directory", "rprinter", COMMENTS, + MOD1, MOD2, MOD3, }; static char *gpdm_fields[] = { - NAME, - NAME, "rpcnum", "host", MOD1, MOD2, MOD3, + NAME, + NAME, "rpcnum", "host", MOD1, MOD2, MOD3, }; static char *apdm_fields[] = { - NAME, "rpcnum", "host" -}; + NAME, "rpcnum", "host" + }; static struct valobj apdm_valobj[] = { - {V_CHAR, 0}, - {V_ID, 2, MACHINE, NAME, MACH_ID, MR_MACHINE}, + {V_CHAR, 0}, + {V_ID, 2, MACHINE, NAME, MACH_ID, MR_MACHINE}, }; static struct validate apdm_validate = { apdm_valobj, 2, NAME, - "palladium.name = LEFT('%s',SIZE(palladium.name))", + "name = LEFT('%s',SIZE(name))", 1, 0, 0, @@ -2116,7 +2340,7 @@ static struct validate dpdm_validate = { 0, 0, NAME, - "palladium.name = '%s'", + "name = '%s'", 1, 0, 0, @@ -2135,7 +2359,7 @@ static char *aali_fields[] = { static struct valobj aali_valobj[] = { {V_CHAR, 0}, - {V_TYPE, 1, "alias", 0, 0, MR_TYPE}, + {V_TYPE, 1, ALIAS, 0, 0, MR_TYPE}, {V_CHAR, 2}, }; @@ -2143,7 +2367,7 @@ static struct validate aali_validate = { aali_valobj, 3, "trans", - "alias.name = LEFT('%s',SIZE(alias.name)) and alias.type = '%s' and alias.trans = LEFT('%s',SIZE(alias.trans))", + "name = LEFT('%s',SIZE(name)) and type = '%s' and trans = LEFT('%s',SIZE(trans))", 3, 0, 0, @@ -2156,7 +2380,7 @@ static struct validate dali_validate = /* DELETE_ALIAS */ 0, 0, "trans", - "alias.name = '%s' and alias.type = '%s' and alias.trans = '%s'", + "name = '%s' and type = '%s' and trans = '%s'", 3, 0, 0, @@ -2193,7 +2417,7 @@ static struct validate aval_validate = /* for aval, uval, and dval */ VOchar0, 1, NAME, - "numvalues.name = LEFT('%s',SIZE(numvalues.name))", /* LEFT() only needed for aval */ + "name = LEFT('%s',SIZE(name))", /* LEFT() only needed for aval */ 1, 0, 0, @@ -2209,6 +2433,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, +}; + /* Generalized Query Definitions */ @@ -2225,14 +2466,14 @@ struct query Queries2[] = { RETRIEVE, "u", USERS, - "CHAR(login), CHAR(uid), shell, CHAR(last), CHAR(first), middle FROM users", + "CHAR(u.login), CHAR(u.uid), u.shell, CHAR(u.last), CHAR(u.first), u.middle FROM users u", galo_fields, 6, - "users_id != 0", + "u.users_id != 0", 0, &VDsort0, }, - + { /* Q_GAAL - GET_ALL_ACTIVE_LOGINS */ "get_all_active_logins", @@ -2240,89 +2481,89 @@ struct query Queries2[] = { RETRIEVE, "u", USERS, - "CHAR(login), CHAR(uid), shell, CHAR(last), CHAR(first), middle FROM users", + "CHAR(u.login), CHAR(u.uid), u.shell, CHAR(u.last), CHAR(u.first), u.middle FROM users u", galo_fields, 6, - "status = 1", + "u.status = 1", 0, &VDsort0, }, - + { - /* Q_GUAL - GET_USER_ACCOUNT_BY_LOGIN */ - "get_user_account_by_login", - "gual", - 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", - gual_fields, - 15, - "u.login LIKE '%s' ESCAPE '*' AND u.users_id != 0 AND u.comment = str.string_id", - 1, - &gubl_validate, + /* Q_GUAL - GET_USER_ACCOUNT_BY_LOGIN */ + "get_user_account_by_login", + "gual", + 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, 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", + 1, + &gubl_validate, }, - + { - /* Q_GUAU - GET_USER_ACCOUNT_BY_UID */ - "get_user_account_by_uid", - "guau", - 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", - guau_fields, - 15, - "u.uid = %s AND u.users_id != 0 AND u.comment = str.string_id", - 1, - &gubu_validate, + /* Q_GUAU - GET_USER_ACCOUNT_BY_UID */ + "get_user_account_by_uid", + "guau", + 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, 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", + 1, + &gubu_validate, }, { - /* Q_GUAN - GET_USER_ACCOUNT_BY_NAME */ - "get_user_account_by_name", - "guan", - 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", - 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, + /* Q_GUAN - GET_USER_ACCOUNT_BY_NAME */ + "get_user_account_by_name", + "guan", + 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, 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, + &guan_validate, }, - + { - /* Q_GUAC - GET_USER_ACCOUNT_BY_CLASS */ - "get_user_account_by_class", - "guac", - 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", - guac_fields, - 15, - "u.type = UPPERCASE('%s') AND u.users_id != 0 AND u.comment = str.string_id", - 1, - &VDsortf, + /* Q_GUAC - GET_USER_ACCOUNT_BY_CLASS */ + "get_user_account_by_class", + "guac", + 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, 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", + 1, + &VDsortf, }, - + { - /* Q_GUAM - GET_USER_ACCOUNT_BY_MITID */ - "get_user_account_by_id", - "guai", - 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", - guam_fields, - 15, - "u.clearid LIKE '%s' ESCAPE '*' AND u.users_id != 0 AND u.comment = str.string_id", - 1, - &VDwildsortf, + /* Q_GUAM - GET_USER_ACCOUNT_BY_MITID */ + "get_user_account_by_id", + "guai", + 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, 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", + 1, + &VDwildsortf, }, - + { /* Q_GUBL - GET_USER_BY_LOGIN */ "get_user_by_login", @@ -2330,14 +2571,14 @@ struct query Queries2[] = { RETRIEVE, "u", USERS, - "CHAR(login), CHAR(uid), shell, CHAR(last), CHAR(first), middle, CHAR(status), CHAR(clearid), type, CHAR(modtime), CHAR(modby), modwith FROM 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, CHAR(u.modtime), CHAR(u.modby), u.modwith FROM users u", gubl_fields, 12, - "login LIKE '%s' ESCAPE '*' AND users_id != 0", + "u.login LIKE '%s' ESCAPE '*' AND u.users_id != 0", 1, &gubl_validate, }, - + { /* Q_GUBU - GET_USER_BY_UID */ "get_user_by_uid", @@ -2345,14 +2586,14 @@ struct query Queries2[] = { RETRIEVE, "u", USERS, - "CHAR(login), CHAR(uid), shell, CHAR(last), CHAR(first), middle, CHAR(status), CHAR(clearid), type, CHAR(modtime), CHAR(modby), modwith FROM 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, CHAR(u.modtime), CHAR(u.modby), u.modwith FROM users u", gubu_fields, 12, - "uid = %s AND users_id != 0", + "u.uid = %s AND u.users_id != 0", 1, &gubu_validate, }, - + { /* Q_GUBN - GET_USER_BY_NAME */ "get_user_by_name", @@ -2360,14 +2601,14 @@ struct query Queries2[] = { RETRIEVE, "u", USERS, - "CHAR(login), CHAR(uid), shell, CHAR(last), CHAR(first), middle, CHAR(status), CHAR(clearid), type, CHAR(modtime), CHAR(modby), modwith FROM 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, CHAR(u.modtime), CHAR(u.modby), u.modwith FROM users u", gubn_fields, 12, - "first LIKE '%s' ESCAPE '*' AND last LIKE '%s' ESCAPE '*' AND users_id != 0", + "u.first LIKE '%s' ESCAPE '*' AND u.last LIKE '%s' ESCAPE '*' AND u.users_id != 0", 2, &gubn_validate, }, - + { /* Q_GUBC - GET_USER_BY_CLASS */ "get_user_by_class", @@ -2375,14 +2616,14 @@ struct query Queries2[] = { RETRIEVE, "u", USERS, - "CHAR(login), CHAR(uid), shell, CHAR(last), CHAR(first), middle, CHAR(status), CHAR(clearid), type, CHAR(modtime), CHAR(modby), modwith FROM 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, CHAR(u.modtime), CHAR(u.modby), u.modwith FROM users u", gubc_fields, 12, - "type = uppercase('%s') AND users_id != 0", + "u.type = uppercase('%s') AND u.users_id != 0", 1, &VDsortf, }, - + { /* Q_GUBM - GET_USER_BY_MITID */ "get_user_by_mitid", @@ -2390,14 +2631,14 @@ struct query Queries2[] = { RETRIEVE, "u", USERS, - "CHAR(login), CHAR(uid), shell, CHAR(last), CHAR(first), middle, CHAR(status), CHAR(clearid), type, CHAR(modtime), CHAR(modby), modwith FROM 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, CHAR(u.modtime), CHAR(u.modby), u.modwith FROM users u", gubm_fields, 12, - "clearid LIKE '%s' ESCAPE '*' AND users_id != 0", + "u.clearid LIKE '%s' ESCAPE '*' AND u.users_id != 0", 1, &VDwildsortf, }, - + { /* Q_AUAC - ADD_USER_ACCOUNT */ /* uses prefetch_value() for users_id */ "add_user_account", @@ -2412,7 +2653,7 @@ struct query Queries2[] = { 0, &auac_validate, }, - + { /* Q_AUSR - ADD_USER */ /* uses prefetch_value() for users_id */ "add_user", @@ -2427,7 +2668,7 @@ struct query Queries2[] = { 0, &ausr_validate, }, - + { /* Q_RUSR - REGISTER_USER */ "register_user", @@ -2442,7 +2683,7 @@ struct query Queries2[] = { 0, &rusr_validate, }, - + { /* Q_UUAC - UPDATE_USER_ACCOUNT */ "update_user_account", @@ -2510,7 +2751,7 @@ struct query Queries2[] = { UPDATE, "u", USERS, - "secure = %s", + "users SET secure = %s", uuss_fields, 1, "users_id = %d", @@ -2555,10 +2796,10 @@ struct query Queries2[] = { RETRIEVE, "k", "krbmap", - "CHAR(u.login), CHAR(s.string) FROM krbmap k, users u, strings s", + "CHAR(u.login), CHAR(str.string) FROM krbmap km, users u, strings str", gkum_fields, 2, - "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", + "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", 2, &VDwild2sort2, }, @@ -2600,10 +2841,10 @@ struct query Queries2[] = { RETRIEVE, "u", USERS, - "CHAR(login), fullname, nickname, home_addr, home_phone, office_addr, office_phone, department, affiliation, CHAR(fmodtime), CHAR(fmodby), fmodwith FROM users", + "CHAR(u.login), u.fullname, u.nickname, u.home_addr, u.home_phone, u.office_addr, u.office_phone, u.department, u.affiliation, CHAR(u.fmodtime), CHAR(u.fmodby), u.fmodwith FROM users u", gfbl_fields, 12, - "users_id = %d", + "u.users_id = %d", 1, &gfbl_validate, }, @@ -2630,10 +2871,10 @@ struct query Queries2[] = { RETRIEVE, "u", USERS, - "CHAR(login), potype, CHAR(pop_id) + ':' + CHAR(box_id), CHAR(pmodtime), CHAR(pmodby), pmodwith FROM users", + "CHAR(u.login), u.potype, CHAR(u.pop_id) + ':' + CHAR(u.box_id), CHAR(u.pmodtime), CHAR(u.pmodby), u.pmodwith FROM users u", gpob_fields, 6, - "users_id = %d", + "u.users_id = %d", 1, &gpob_validate, }, @@ -2645,10 +2886,10 @@ struct query Queries2[] = { RETRIEVE, "u", USERS, - "CHAR(login), potype, CHAR(pop_id) + ':' + CHAR(box_id) FROM users", + "CHAR(u.login), u.potype, CHAR(u.pop_id) + ':' + CHAR(u.box_id) FROM users u", gpox_fields, 3, - "potype != 'NONE'", + "u.potype != 'NONE'", 0, &gpox_validate, }, @@ -2660,10 +2901,10 @@ struct query Queries2[] = { RETRIEVE, "u", USERS, - "CHAR(login), potype, CHAR(pop_id) + ':' + CHAR(box_id) FROM users", + "CHAR(u.login), u.potype, CHAR(u.pop_id) + ':' + CHAR(u.box_id) FROM users u", gpox_fields, 3, - "potype = 'POP'", + "u.potype = 'POP'", 0, &gpox_validate }, @@ -2675,10 +2916,10 @@ struct query Queries2[] = { RETRIEVE, "u", USERS, - "CHAR(login), potype, CHAR(pop_id) + ':' + CHAR(box_id) FROM users", + "CHAR(u.login), u.potype, CHAR(u.pop_id) + ':' + CHAR(u.box_id) FROM users u", gpox_fields, 3, - "potype = 'SMTP'", + "u.potype = 'SMTP'", 0, &gpox_validate }, @@ -2735,57 +2976,177 @@ struct query Queries2[] = { RETRIEVE, "m", MACHINE, - "CHAR(name), type, CHAR(modtime), CHAR(modby), modwith FROM machine", + "CHAR(m.name), m.vendor, CHAR(m.modtime), CHAR(m.modby), m.modwith FROM machine m", gmac_fields, 5, - "name LIKE '%s' ESCAPE '*' AND mach_id != 0", + "m.name LIKE '%s' ESCAPE '*' AND m.mach_id != 0", 1, &VDupwildsortf, }, { - /* Q_AMAC - ADD_MACHINE */ /* uses prefetch_value() for mach_id */ - "add_machine", - "amac", + /* Q_GHST - GET_HOST */ + "get_host", + "ghst", + RETRIEVE, + "m", + MACHINE, + "CHAR(m.name), m.vendor, m.model, m.os, m.location, m.contact, CHAR(m.use), CHAR(m.status), CHAR(m.statuschange), CHAR(s.name), m.address, m.owner_type, CHAR(m.owner_id), CHAR(m.acomment), CHAR(m.ocomment), CHAR(m.created), CHAR(m.creator), CHAR(m.inuse), CHAR(m.modtime), CHAR(m.modby), m.modwith FROM machine m, subnet s", + ghst_fields, + 21, + "m.name LIKE '%s' ESCAPE '*' AND m.address LIKE '%s' ESCAPE '*' AND m.location LIKE '%s' ESCAPE '*' AND m.contact LIKE '%s' ESCAPE '*' AND m.mach_id != 0 AND s.snet_id = m.snet_id", + 4, + &ghst_validate, + }, + + { + /* Q_AHST - ADD_HOST */ /* uses prefetch_value() for mach_id */ + "add_host", + "ahst", APPEND, "m", MACHINE, - "INTO machine (name, type, mach_id) VALUES (uppercase('%s'),'%s',%s)", - amac_fields, - 2, + "INTO machine (name, vendor, model, os, location, contact, use, status, statuschange, snet_id, address, owner_type, owner_id, acomment, ocomment, created, inuse, mach_id, creator) VALUES (uppercase('%s'),uppercase('%s'),uppercase('%s'),uppercase('%s'),uppercase('%s'),'%s',%s,%s,date('now'),%d,'%s','%s',%d,%d,%d,date('now'),date('now'),%s,%s)", + ahst_fields, + 14, 0, 0, - &amac_validate, + &ahst_validate, }, { - /* Q_UMAC - UPDATE_MACHINE */ - "update_machine", - "umac", + /* Q_UHST - UPDATE_HOST */ + "update_host", + "uhst", UPDATE, "m", MACHINE, - "machine SET name = uppercase('%s'), type = '%s'", - umac_fields, - 2, + "machine SET name=uppercase('%s'),vendor=uppercase('%s'),model=uppercase('%s'),os=uppercase('%s'),location=uppercase('%s'),contact='%s',use=%s,status=%s,snet_id=%d,address='%s',owner_type='%s',owner_id=%d,acomment=%d,ocomment=%d", + uhst_fields, + 14, "mach_id = %d", 1, - &umac_validate, + &uhst_validate, }, { - /* Q_DMAC - DELETE_MACHINE */ - "delete_machine", - "dmac", + /* Q_DHST - DELETE_HOST */ + "delete_host", + "dhst", DELETE, "m", MACHINE, (char *)0, - dmac_fields, + dhst_fields, 0, "mach_id = %d", 1, - &dmac_validate, + &dhst_validate, + }, + + { + /* Q_GHAL - GET_HOSTALIAS */ + "get_hostalias", + "ghal", + RETRIEVE, + "a", + "hostalias", + "CHAR(a.name), CHAR(m.name) FROM hostalias a, machine m", + ghal_fields, + 2, + "m.mach_id = a.mach_id and a.name LIKE '%s' ESCAPE '*' AND m.name LIKE '%s' ESCAPE '*'", + 2, + &ghal_validate, + }, + + { + /* Q_AHAL - ADD_HOSTALIAS */ + "add_hostalias", + "ahal", + APPEND, + "a", + "hostalias", + "INTO hostalias (name, mach_id) VALUES (uppercase('%s'),%d)", + ghal_fields, + 2, + 0, + 0, + &ahal_validate, + }, + + { + /* Q_DHAL - DELETE_HOSTALIAS */ + "delete_hostalias", + "dhal", + DELETE, + "a", + "hostalias", + (char *)0, + ghal_fields, + 0, + "name = uppercase('%s') AND mach_id = %d", + 2, + &dhal_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.prefix, s.owner_type, CHAR(s.owner_id), CHAR(s.modtime), CHAR(s.modby), s.modwith FROM subnet s", + gsnt_fields, + 12, + "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, prefix, owner_type, owner_id, snet_id) VALUES (uppercase('%s'), '%s', %s, %s, %s, %s, '%s', '%s', %d, %s)", + asnt_fields, + 9, + 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, prefix='%s', owner_type='%s', owner_id=%d", + usnt_fields, + 9, + "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, }, { @@ -2795,10 +3156,10 @@ struct query Queries2[] = { RETRIEVE, "c", CLUSTER, - "CHAR(name), description, location, CHAR(modtime), CHAR(modby), modwith FROM cluster", + "CHAR(c.name), c.description, c.location, CHAR(c.modtime), CHAR(c.modby), c.modwith FROM cluster c", gclu_fields, 6, - "name LIKE '%s' ESCAPE '*' AND clu_id != 0", + "c.name LIKE '%s' ESCAPE '*' AND c.clu_id != 0", 1, &VDwildsortf, }, @@ -2853,12 +3214,12 @@ struct query Queries2[] = { "get_machine_to_cluster_map", "gmcm", RETRIEVE, - "map", + "mcm", "mcmap", - "CHAR(m.name), CHAR(c.name) FROM machine m, cluster c, mcmap map", + "CHAR(m.name), CHAR(c.name) FROM machine m, cluster c, mcmap mcm", gmcm_fields, 2, - "m.name LIKE '%s' ESCAPE '*' AND c.name LIKE '%s' ESCAPE '*' AND map.clu_id = c.clu_id AND map.mach_id = m.mach_id", + "m.name LIKE '%s' ESCAPE '*' AND c.name LIKE '%s' ESCAPE '*' AND mcm.clu_id = c.clu_id AND mcm.mach_id = m.mach_id", 2, &gmcm_validate, }, @@ -2868,7 +3229,7 @@ struct query Queries2[] = { "add_machine_to_cluster", "amtc", APPEND, - "m", + "mcm", "mcmap", "INTO mcmap (mach_id, clu_id) VALUES (%d, %d)", gmcm_fields, @@ -2883,7 +3244,7 @@ struct query Queries2[] = { "delete_machine_from_cluster", "dmfc", DELETE, - "m", + "mcm", "mcmap", 0, gmcm_fields, @@ -2898,12 +3259,12 @@ struct query Queries2[] = { "get_cluster_data", "gcld", RETRIEVE, - "s", "svc", - "CHAR(c.name), CHAR(s.serv_label), s.serv_cluster FROM svc s, cluster c", + "svc", + "CHAR(c.name), CHAR(svc.serv_label), svc.serv_cluster FROM svc svc, cluster c", gcld_fields, 3, - "c.clu_id = s.clu_id AND c.name LIKE '%s' ESCAPE '*' AND s.serv_label LIKE '%s' ESCAPE '*'", + "c.clu_id = svc.clu_id AND c.name LIKE '%s' ESCAPE '*' AND svc.serv_label LIKE '%s' ESCAPE '*'", 2, &VDwild2sort2, }, @@ -2913,7 +3274,7 @@ struct query Queries2[] = { "add_cluster_data", "acld", APPEND, - "s", + "svc", "svc", "INTO svc (clu_id, serv_label, serv_cluster) VALUES (%d,'%s','%s')", acld_fields, @@ -2928,7 +3289,7 @@ struct query Queries2[] = { "delete_cluster_data", "dcld", DELETE, - "s", + "svc", "svc", (char *)0, acld_fields, @@ -2945,10 +3306,10 @@ struct query Queries2[] = { RETRIEVE, "s", "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", + "CHAR(s.name), CHAR(s.update_int), s.target_file, s.script, CHAR(s.dfgen), CHAR(s.dfcheck), s.type, CHAR(s.enable), CHAR(s.inprogress), CHAR(s.harderror), s.errmsg, s.acl_type, CHAR(s.acl_id), CHAR(s.modtime), CHAR(s.modby), s.modwith FROM servers s", gsin_fields, 16, - "name LIKE '%s' ESCAPE '*'", + "s.name LIKE '%s' ESCAPE '*'", 1, &gsin_validate, }, @@ -3059,7 +3420,7 @@ struct query Queries2[] = { }, { - /* Q_QGSV - QUALIFIED_GET_SERVER_HOST */ + /* Q_QGSH - QUALIFIED_GET_SERVER_HOST */ "qualified_get_server_host", "qgsh", RETRIEVE, @@ -3455,8 +3816,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 +3885,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 +3904,12 @@ struct query Queries2[] = { "update_quota", "uqot", UPDATE, - "q", + 0, QUOTA, "quota SET quota = %s", aqot_fields, 1, - "quota.filsys_id = %d AND quota.type = '%s' AND quota.entity_id = %d", + 0, 3, &uqot_validate, }, @@ -3558,12 +3919,12 @@ struct query Queries2[] = { "delete_quota", "dqot", DELETE, - "q", + 0, QUOTA, (char *)0, aqot_fields, 0, - "quota.filsys_id = %d AND quota.type = '%s' AND quota.entity_id = %d", + 0, 3, &dqot_validate, }, @@ -3599,31 +3960,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 +3994,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, }, @@ -3665,10 +4026,10 @@ struct query Queries2[] = { RETRIEVE, "l", LIST, - "CHAR(name) FROM list", + "CHAR(l.name) FROM list l", glin_fields, 1, - "name LIKE '%s' ESCAPE '*' AND list_id != 0", + "l.name LIKE '%s' ESCAPE '*' AND l.list_id != 0", 1, &VDwild0, }, @@ -3845,10 +4206,10 @@ struct query Queries2[] = { RETRIEVE, "z", "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", + "CHAR(z.class), z.xmt_type, CHAR(z.xmt_id), z.sub_type, CHAR(z.sub_id), z.iws_type, CHAR(z.iws_id), z.iui_type, CHAR(z.iui_id), CHAR(z.modtime), CHAR(z.modby), z.modwith FROM zephyr z", gzcl_fields, 12, - "class LIKE '%s' ESCAPE '*'", + "z.class LIKE '%s' ESCAPE '*'", 1, &gzcl_validate, }, @@ -3875,7 +4236,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'", @@ -3903,12 +4264,12 @@ struct query Queries2[] = { "get_service", "gsvc", RETRIEVE, - "s", + "ss", "services", - "CHAR(name), protocol, CHAR(port), description, CHAR(modtime), CHAR(modby), modwith FROM services", + "CHAR(ss.name), ss.protocol, CHAR(ss.port), ss.description, CHAR(ss.modtime), CHAR(ss.modby), ss.modwith FROM services ss", gsvc_fields, 7, - "name LIKE '%s' ESCAPE '*'", + "ss.name LIKE '%s' ESCAPE '*'", 1, &VDwildsortf, }, @@ -3918,7 +4279,7 @@ struct query Queries2[] = { "add_service", "asvc", APPEND, - "s", + "ss", "services", "INTO services (name, protocol, port, description) VALUES ('%s','%s',%s,'%s')", asvc_fields, @@ -3933,7 +4294,7 @@ struct query Queries2[] = { "delete_service", "dsvc", DELETE, - "s", + "ss", "services", 0, asvc_fields, @@ -3948,12 +4309,12 @@ struct query Queries2[] = { "get_printcap_entry", "gpce", RETRIEVE, - "p", + "pc", "printcap", - "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", + "CHAR(pc.name), CHAR(m.name), pc.dir, pc.rp, CHAR(pc.quotaserver), CHAR(pc.auth), CHAR(pc.price), pc.comments, CHAR(pc.modtime), CHAR(pc.modby), pc.modwith FROM printcap pc, machine m", gpce_fields, 11, - "p.name LIKE '%s' ESCAPE '*' AND m.mach_id = p.mach_id", + "pc.name LIKE '%s' ESCAPE '*' AND m.mach_id = pc.mach_id", 1, &gpce_validate, }, @@ -3963,7 +4324,7 @@ struct query Queries2[] = { "add_printcap_entry", "apce", APPEND, - "p", + "pc", "printcap", "INTO printcap (name, mach_id, dir, rp, quotaserver, auth, price, comments) VALUES ('%s',%d,'%s','%s',%d,%s,%s,'%s')", apce_fields, @@ -3978,7 +4339,7 @@ struct query Queries2[] = { "delete_printcap_entry", "dpce", DELETE, - "p", + "pc", "printcap", 0, apce_fields, @@ -3993,12 +4354,12 @@ struct query Queries2[] = { "get_printcap", "gpcp", RETRIEVE, - "p", + "pc", "printcap", - "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", + "CHAR(pc.name), CHAR(m.name), pc.dir, pc.rp, pc.comments, CHAR(pc.modtime), CHAR(pc.modby), pc.modwith FROM printcap pc, machine m", gpcp_fields, 8, - "p.name LIKE '%s' ESCAPE '*' AND m.mach_id = p.mach_id", + "pc.name LIKE '%s' ESCAPE '*' AND m.mach_id = pc.mach_id", 1, &VDwildsortf, }, @@ -4008,7 +4369,7 @@ struct query Queries2[] = { "delete_printcap", "dpcp", DELETE, - "p", + "pc", "printcap", 0, apce_fields, @@ -4023,12 +4384,12 @@ struct query Queries2[] = { "get_palladium", "gpdm", RETRIEVE, - "p", + "pal", "palladium", - "CHAR(p.name), CHAR(p.ident), CHAR(m.name), CHAR(p.modtime), CHAR(p.modby), p.modwith FROM palladium p, machine m", + "CHAR(pal.name), CHAR(pal.ident), CHAR(m.name), CHAR(pal.modtime), CHAR(pal.modby), pal.modwith FROM palladium pal, machine m", gpdm_fields, 6, - "p.name LIKE '%s' ESCAPE '*' AND m.mach_id = p.mach_id", + "pal.name LIKE '%s' ESCAPE '*' AND m.mach_id = pal.mach_id", 1, &VDwildsortf, }, @@ -4038,7 +4399,7 @@ struct query Queries2[] = { "add_palladium", "apdm", APPEND, - "p", + "pal", "palladium", "INTO palladium (name, ident, mach_id) VALUES ('%s',%s,%d)", apdm_fields, @@ -4053,7 +4414,7 @@ struct query Queries2[] = { "delete_palladium", "dpdm", DELETE, - "p", + "pal", "palladium", 0, apdm_fields, @@ -4069,11 +4430,11 @@ struct query Queries2[] = { "gali", RETRIEVE, "a", - "alias", - "CHAR(name), CHAR(type), CHAR(trans) FROM alias", + ALIAS, + "CHAR(a.name), CHAR(a.type), CHAR(a.trans) FROM alias a", gali_fields, 3, - "name LIKE '%s' ESCAPE '*' AND type LIKE '%s' ESCAPE '*' AND trans LIKE '%s' ESCAPE '*'", + "a.name LIKE '%s' ESCAPE '*' AND a.type LIKE '%s' ESCAPE '*' AND a.trans LIKE '%s' ESCAPE '*'", 3, &VDwild3sort1, }, @@ -4084,7 +4445,7 @@ struct query Queries2[] = { "aali", APPEND, "a", - "alias", + ALIAS, "INTO alias (name, type, trans) VALUES ('%s', '%s', '%s')", aali_fields, 3, @@ -4099,7 +4460,7 @@ struct query Queries2[] = { "dali", DELETE, "a", - "alias", + ALIAS, (char *)0, aali_fields, 0, @@ -4113,12 +4474,12 @@ struct query Queries2[] = { "get_value", "gval", RETRIEVE, - "v", + "val", "numvalues", - "CHAR(value) FROM numvalues", + "CHAR(val.value) FROM numvalues val", gval_fields, 1, - "name = '%s'", + "val.name = '%s'", 1, &gval_validate, }, @@ -4128,7 +4489,7 @@ struct query Queries2[] = { "add_value", "aval", APPEND, - "v", + "val", "numvalues", "INTO numvalues (name, value) VALUES ('%s', %s)", aval_fields, @@ -4143,7 +4504,7 @@ struct query Queries2[] = { "update_value", "uval", UPDATE, - "v", + "val", "numvalues", "numvalues SET value = %s", aval_fields, @@ -4158,7 +4519,7 @@ struct query Queries2[] = { "delete_value", "dval", DELETE, - "v", + "val", "numvalues", (char *)0, dval_fields, @@ -4175,7 +4536,7 @@ struct query Queries2[] = { RETRIEVE, "tbs", "tblstats", - "table_name, CHAR(appends), CHAR(updates), CHAR(deletes), CHAR(modtime) FROM tblstats", + "tbs.table_name, CHAR(tbs.appends), CHAR(tbs.updates), CHAR(tbs.deletes), CHAR(tbs.modtime) FROM tblstats tbs", gats_fields, 5, (char *)0, @@ -4183,6 +4544,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));