X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/68dd808d46f874aa110ce1f4a455bd5afb03e651..f0e5d2fedf8aa93d4b0627630f3a887c2bfc2abf:/server/queries2.c diff --git a/server/queries2.c b/server/queries2.c index 0b9b2912..2244f358 100644 --- a/server/queries2.c +++ b/server/queries2.c @@ -8,6 +8,10 @@ */ #include +#include "mr_server.h" +#undef ACE_TYPE +#undef ACE_NAME +#undef NAME #include "query.h" #include "mr_et.h" @@ -23,13 +27,19 @@ 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(); +int prefetch_filesys(); int setup_ausr(); int setup_dusr(); int setup_spop(); int setup_dpob(); int setup_dmac(); +int setup_dsnet(); int setup_dclu(); int setup_alis(); int setup_dlis(); @@ -38,10 +48,13 @@ int setup_dshi(); int setup_afil(); int setup_ufil(); int setup_dfil(); +int setup_aftg(); 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(); @@ -49,10 +62,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(); @@ -74,12 +92,14 @@ int delete_member_from_list(); int get_ace_use(); int qualified_get_lists(); int get_members_of_list(); +int get_end_members_of_list(); int qualified_get_server(); int qualified_get_serverhost(); int trigger_dcm(); int count_members_of_list(); int get_lists_of_member(); int register_user(); +int _sdl_followup(); @@ -90,17 +110,21 @@ 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"; +static char CLUSTER[] = "clusters"; +static char COMMENTS[] = "comments"; static char DESC[] = "description"; static char DEVICE[] = "device"; static char DIR[] = "dir"; static char FILESYS[] = "filesys"; static char FILSYS_ID[] = "filsys_id"; -static char FIRST[] = "firstname"; +static char FIRST[] = "first"; +static char HOSTACCESS[] = "hostaccess"; static char LABEL[] = "label"; -static char LAST[] = "lastname"; +static char LAST[] = "last"; static char LIST[] = "list"; static char LIST_ID[] = "list_id"; static char LOCATION[] = "location"; @@ -113,16 +137,32 @@ static char MOD1[] = "modtime"; static char MOD2[] = "modby"; static char MOD3[] = "modwith"; static char NAME[] = "name"; +static char PRINTCAP[] = "printcap"; static char QUOTA[] = "quota"; static char QUOTA_TYPE[] = "quota_type"; +static char SECURE[] = "secure"; static char SERVICE[] = "service"; +static char SERVERS[] = "servers"; 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"; static char USERS_ID[] = "users_id"; -static char UID[] = "uid"; +static char UID[] = "unix_uid"; +static char ZEPH[] = "zephyr"; +static char ZEPH_ID[] = "xmt_id"; +/* Table Names */ +char *table_name[] = { + "none", USERS, "krbmap", MACHINE, "hostalias", SUBNET, CLUSTER, + "mcmap", "svc", LIST, "imembers", SERVERS, "serverhosts", FILESYS, + "fsgroup", "nfsphys", "quota", ZEPH, HOSTACCESS, "strings", "services", + PRINTCAP, "palladium", "capacls", "alias", "numvalues", "tblstats", + "incremental"}; +int num_tables = 27; /* VALOBJS @@ -130,57 +170,67 @@ static char UID[] = "uid"; * can be shared. */ -static struct valobj VOsort0[] = { - {V_SORT, 0, 0, 0, 0, 0}, +/* + * A word about validation objects and locking: The validation object + * for a query should also request locks on behalf of the pre-processing + * and post-processing routines. This helps to ensure that tables are + * accessed and locked in the proper order and thus avoids deadlock + * situations + */ + +static struct valobj VOwild0[] = { + {V_WILD, 0}, +}; + +static struct valobj VOupwild0[] = { + {V_UPWILD, 0}, }; -static struct valobj VOdate1[] = { - {V_DATE, 1, 0, 0, 0, MR_DATE}, +static struct valobj VOwild01[] = { + {V_WILD, 0}, + {V_WILD, 1}, }; +static struct valobj VOwild012[] = { + {V_WILD, 0}, + {V_WILD, 1}, + {V_WILD, 2}, +}; + + static struct valobj VOuser0[] = { - {V_ID, 0, USERS, LOGIN, USERS_ID, MR_USER}, + {V_ID, 0, USERS_TABLE, LOGIN, USERS_ID, MR_USER}, }; + static struct valobj VOuser0lock[] = { - {V_LOCK, 0, USERS, 0, USERS_ID, MR_DEADLOCK}, - {V_ID, 0, USERS, LOGIN, USERS_ID, MR_USER}, + {V_LOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_ID, 0, USERS_TABLE, LOGIN, USERS_ID, MR_USER}, }; static struct valobj VOmach0[] = { - {V_ID, 0, MACHINE, NAME, MACH_ID, MR_MACHINE}, + {V_ID, 0, MACHINE_TABLE, NAME, MACH_ID, MR_MACHINE}, }; static struct valobj VOclu0[] = { - {V_ID, 0, CLUSTER, NAME, CLU_ID, MR_CLUSTER}, + {V_ID, 0, CLUSTER_TABLE, NAME, CLU_ID, MR_CLUSTER}, }; static struct valobj VOlist0[] = { - {V_ID, 0, LIST, NAME, LIST_ID, MR_LIST}, + {V_ID, 0, LIST_TABLE, NAME, LIST_ID, MR_LIST}, }; -static struct valobj VOfilsys0[] = { - {V_ID, 0, FILESYS, LABEL, FILSYS_ID, MR_FILESYS}, -}; static struct valobj VOchar0[] = { {V_CHAR, 0}, }; -static struct valobj VOsort01[] = { - {V_SORT, 1}, - {V_SORT, 0}, -}; -static struct valobj VOuser0sort[] = { - {V_ID, 0, USERS, LOGIN, USERS_ID, MR_USER}, - {V_SORT, 0}, -}; static struct valobj VOfilsys0user1[] = { - {V_LOCK, 0, FILESYS, 0, FILSYS_ID, MR_DEADLOCK}, - {V_ID, 0, FILESYS, LABEL, FILSYS_ID, MR_FILESYS}, - {V_ID, 1, USERS, LOGIN, USERS_ID, MR_USER}, + {V_LOCK, 0, FILESYS_TABLE, 0, FILSYS_ID, MR_DEADLOCK}, + {V_ID, 0, FILESYS_TABLE, LABEL, FILSYS_ID, MR_FILESYS}, + {V_ID, 1, USERS_TABLE, LOGIN, USERS_ID, MR_USER}, }; @@ -190,36 +240,67 @@ static struct valobj VOfilsys0user1[] = { */ static struct validate VDmach = { VOmach0, 1 }; -static struct validate VDsort2= { VOsort01,2 }; -static struct validate VDsortf = { - VOsort0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - followup_fix_modby, +static struct validate VDwild0= { VOwild0, 1 }; +static struct validate VDupwild0= { VOupwild0, 1 }; +static struct validate VDwild2 = { VOwild01,2 }; +static struct validate VDwild3 = { VOwild012,3 }; +static struct validate VDfixmodby = { + 0 + 0, + 0, + 0, + 0, + 0, + 0, + 0, + followup_fix_modby, +}; + +static struct validate VDwildfixmodby = { + VOwild0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + followup_fix_modby, }; +static struct validate VDupwildfixmodby = { + VOupwild0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + followup_fix_modby, +}; - /* Query data */ static char *galo_fields[] = { LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, }; +static char *gual_fields[] = { + LOGIN, + 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, - MIT_ID, CLASS, MOD1, MOD2, MOD3 + MIT_ID, CLASS, MOD1, MOD2, MOD3, }; -static struct validate gubx_validate = /* gubl, gubu */ +static struct validate gubl_validate = { - VOsort0, + VOwild0, 1, 0, 0, @@ -227,7 +308,44 @@ static struct validate gubx_validate = /* gubl, gubu */ 0, access_login, 0, - followup_fix_modby, + followup_guax, +}; + +static char *guau_fields[] = { + 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, +}; + +static struct validate guan_validate = +{ + VOwild01, + 2, + 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, +}; + +static char *guam_fields[] = { + MIT_ID, + LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, STATUS, + MIT_ID, CLASS, COMMENTS, SIGNATURE, SECURE, MOD1, MOD2, MOD3, }; static char *gubu_fields[] = { @@ -236,12 +354,42 @@ static char *gubu_fields[] = { MIT_ID, CLASS, MOD1, MOD2, MOD3, }; +static struct valobj gubu_valobj[] = { + {V_NUM, 0} +}; + +static struct validate gubu_validate = +{ + gubu_valobj, + 1, + 0, + 0, + 0, + 0, + access_login, + 0, + followup_fix_modby, +}; + static char *gubn_fields[] = { FIRST, LAST, LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, STATUS, MIT_ID, CLASS, MOD1, MOD2, MOD3, }; +static struct validate gubn_validate = +{ + VOwild01, + 2, + 0, + 0, + 0, + 0, + 0, + 0, + followup_fix_modby, +}; + static char *gubc_fields[] = { CLASS, LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, STATUS, @@ -254,26 +402,61 @@ static char *gubm_fields[] = { MIT_ID, CLASS, MOD1, MOD2, MOD3, }; -static char *ausr_fields[] = { - LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, STATUS, - MIT_ID, CLASS, +static char *gudf_fields[] = { + LOGIN, + "dirsuppress", "dirremote" }; -static struct valobj ausr_valobj[] = { - {V_LOCK, 0, USERS, 0, USERS_ID, MR_DEADLOCK}, - {V_CHAR, 0}, - {V_CHAR, 3}, - {V_CHAR, 4}, - {V_CHAR, 5}, - {V_CHAR, 7}, - {V_TYPE, 8, CLASS, 0, 0, MR_BAD_CLASS}, +static struct validate gudf_validate = +{ + VOuser0, + 2, + 0, + 0, + 0, + 0, + access_user, + 0, + 0, +}; + +static char *auac_fields[] = { + LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, STATUS, + MIT_ID, CLASS, COMMENTS, SIGNATURE, SECURE, +}; + +static struct valobj auac_valobj[] = { + {V_LOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_CHAR, 0, USERS_TABLE, LOGIN}, + {V_NUM, 1}, + {V_CHAR, 2, USERS_TABLE, SHELL}, + {V_CHAR, 3, USERS_TABLE, LAST}, + {V_CHAR, 4, USERS_TABLE, FIRST}, + {V_CHAR, 5, USERS_TABLE, MIDDLE}, + {V_NUM, 6}, + {V_CHAR, 7, USERS_TABLE, MIT_ID}, + {V_TYPE, 8, 0, CLASS, 0, MR_BAD_CLASS}, + {V_ID, 9, STRINGS_TABLE, "string", "string_id", MR_NO_MATCH}, + {V_NUM, 10} +}; + +static struct validate auac_validate = { + auac_valobj, + 12, + LOGIN, + "login = '%s'", + 1, + USERS_ID, + 0, + setup_ausr, + followup_ausr, }; static struct validate ausr_validate = { - ausr_valobj, - 7, + auac_valobj, + 10, LOGIN, - "users.login = '%s'", + "login = '%s'", 1, USERS_ID, 0, @@ -286,15 +469,22 @@ static char *rusr_fields[] = { }; static struct valobj rusr_valobj[] = { - {V_LOCK, 0, USERS, 0, USERS_ID, MR_DEADLOCK}, - {V_LOCK, 0, LIST, 0, LIST_ID, MR_DEADLOCK}, - {V_LOCK, 0, FILESYS, 0, FILSYS_ID, MR_DEADLOCK}, - {V_LOCK, 0, "nfsphys", 0, "nfsphys_id", MR_DEADLOCK}, + {V_LOCK, 0, IMEMBERS_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_LOCK, 0, FILESYS_TABLE, 0, FILSYS_ID, MR_DEADLOCK}, + {V_LOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_RLOCK, 0, MACHINE_TABLE, 0,MACH_ID, MR_DEADLOCK}, + {V_LOCK, 0, LIST_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_LOCK, 0, NFSPHYS_TABLE, 0, "nfsphys_id", MR_DEADLOCK}, + {V_LOCK, 0, QUOTA_TABLE,0, FILSYS_ID, MR_DEADLOCK}, + {V_RLOCK,0, SERVERHOSTS_TABLE,0, MACH_ID, MR_DEADLOCK}, + {V_NUM, 0}, + {V_CHAR, 1}, + {V_NUM, 2}, }; static struct validate rusr_validate = { rusr_valobj, - 4, + 11, 0, 0, 0, @@ -304,32 +494,49 @@ static struct validate rusr_validate = { 0, }; -static char *uusr_fields[] = { +static char *uuac_fields[] = { LOGIN, "newlogin", UID, SHELL, LAST, FIRST, MIDDLE, STATUS, - MIT_ID, CLASS, + MIT_ID, CLASS, COMMENTS, SIGNATURE, SECURE, }; -static struct valobj uusr_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}, +static struct valobj uuac_valobj[] = { + {V_LOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_ID, 0, USERS_TABLE, LOGIN, USERS_ID, MR_USER}, + {V_RENAME, 1, USERS_TABLE, LOGIN, USERS_ID, MR_NOT_UNIQUE}, + {V_NUM, 2}, + {V_CHAR, 3, USERS_TABLE, SHELL}, + {V_CHAR, 4, USERS_TABLE, FIRST}, + {V_CHAR, 5, USERS_TABLE, LAST}, + {V_CHAR, 6, USERS_TABLE, MIDDLE}, + {V_NUM, 7}, + {V_CHAR, 8, USERS_TABLE, MIT_ID}, + {V_TYPE, 9, 0, CLASS, 0, MR_BAD_CLASS}, + {V_ID, 10, STRINGS_TABLE, "string", "string_id", MR_NO_MATCH}, + {V_NUM, 12}, }; -static struct validate uusr_validate = { - uusr_valobj, - 8, +static struct validate uuac_validate = { + uuac_valobj, + 13, 0, 0, 0, USERS_ID, 0, + setup_ausr, + followup_uuac, +}; + +static struct validate uusr_validate = { + uuac_valobj, + 12, + 0, + 0, + 0, + USERS_ID, 0, + setup_ausr, set_modtime_by_id, }; @@ -338,9 +545,15 @@ static char *uush_fields[] = { SHELL, }; +static struct valobj uush_valobj[] = { + {V_LOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_ID, 0, USERS_TABLE, LOGIN, USERS_ID, MR_USER}, + {V_CHAR, 1, USERS_TABLE, SHELL}, +}; + static struct validate uush_validate = { - VOuser0lock, - 2, + uush_valobj, + 3, 0, 0, 0, @@ -355,9 +568,21 @@ static char *uust_fields[] = { STATUS, }; +static char *uuss_fields[] = { + LOGIN, + SECURE, +}; + +static struct valobj uust_valobj[] = { + {V_LOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_ID, 0, USERS_TABLE, LOGIN, USERS_ID, MR_USER}, + {V_NUM, 1}, + {V_NUM, 2}, +}; + static struct validate uust_validate = { - VOuser0lock, - 2, + uust_valobj, + 3, 0, 0, 0, @@ -367,13 +592,41 @@ static struct validate uust_validate = { set_modtime_by_id, }; +static char *uudf_fields[] = { + LOGIN, + "dirsuppress", "dirremote" +}; + +static struct validate uudf_validate = { + uust_valobj, + 4, + 0, + 0, + 0, + USERS_ID, + access_user, + 0, + set_modtime_by_id, +}; + static char *dusr_fields[] = { LOGIN, }; +struct valobj dusr_valobj[]= { + {V_LOCK, 0, IMEMBERS_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_LOCK, 0, FILESYS_TABLE, 0, FILSYS_ID, MR_DEADLOCK}, + {V_LOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_LOCK, 0, LIST_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_LOCK, 0, QUOTA_TABLE, 0, FILSYS_ID, MR_DEADLOCK}, + {V_LOCK, 0, HOSTACCESS_TABLE, 0, MACH_ID, MR_DEADLOCK}, + {V_LOCK, 0, KRBMAP_TABLE, 0, "users_id", MR_DEADLOCK}, + {V_ID, 0, USERS_TABLE, LOGIN, USERS_ID, MR_USER}, +}; + static struct validate dusr_validate = { - VOuser0lock, - 2, + dusr_valobj, + 8, 0, 0, 0, @@ -388,8 +641,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_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_ID, 0, USERS_TABLE, UID, USERS_ID, MR_USER} }; static struct validate dubu_validate = { @@ -405,40 +658,42 @@ 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_LOCK, 0, KRBMAP_TABLE, 0, "users_id", MR_DEADLOCK}, + {V_ID, 0, USERS_TABLE, LOGIN, USERS_ID, MR_USER}, + {V_ID, 1, STRINGS_TABLE, "string", "string_id", MR_NO_MATCH}, + }; static struct validate akum_validate = { - akum_valobj, - 1, - USERS_ID, - "kerberos.users_id = %d or kerberos.string_id = %d", - 2, - USERS_ID, - access_user, - setup_akum, - 0 + akum_valobj, + 3, + 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, - "kerberos.users_id = %d and kerberos.string_id = %d", - 2, - USERS_ID, - access_user, - 0, - 0 + akum_valobj, + 3, + USERS_ID, + "users_id = %d and string_id = %d", + 2, + USERS_ID, + access_user, + 0, + 0, }; static char *gfbl_fields[] = { @@ -467,9 +722,22 @@ static char *ufbl_fields[] = { "affiliation", }; +static struct valobj ufbl_valobj[] = { + {V_LOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_ID, 0, USERS_TABLE, LOGIN, USERS_ID, MR_USER}, + {V_LEN, 1, USERS_TABLE, "fullname"}, + {V_LEN, 2, USERS_TABLE, "nickname"}, + {V_LEN, 3, USERS_TABLE, "home_addr"}, + {V_LEN, 4, USERS_TABLE, "home_phone"}, + {V_LEN, 5, USERS_TABLE, "office_addr"}, + {V_LEN, 6, USERS_TABLE, "office_phone"}, + {V_LEN, 7, USERS_TABLE, "department"}, + {V_LEN, 8, USERS_TABLE, "affiliation"}, +}; + static struct validate ufbl_validate = { - VOuser0lock, - 2, + ufbl_valobj, + 10, 0, 0, 0, @@ -488,7 +756,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, @@ -500,9 +768,14 @@ static char *gpox_fields[] = { LOGIN, TYPE, "box", }; +struct valobj gpox_valobj[]={ + {V_RLOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_RLOCK, 0, MACHINE_TABLE, 0, MACH_ID, MR_DEADLOCK} +}; + static struct validate gpox_validate = { - 0, - 0, + gpox_valobj, + 2, 0, 0, 0, @@ -517,15 +790,16 @@ static char *spob_fields[] = { }; static struct valobj spob_valobj[] = { - {V_LOCK, 0, USERS, 0, USERS_ID, MR_DEADLOCK}, - {V_ID, 0, USERS, LOGIN, USERS_ID, MR_USER}, - {V_TYPE, 1, "pobox", 0, 0, MR_TYPE}, + {V_LOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_RLOCK, 0, MACHINE_TABLE, 0, MACH_ID, MR_DEADLOCK}, + {V_ID, 0, USERS_TABLE, LOGIN, USERS_ID, MR_USER}, + {V_TYPE, 1, 0, "pobox", 0, MR_TYPE}, }; static struct validate spob_validate = /* SET_POBOX */ { spob_valobj, - 3, + 4, 0, 0, 0, @@ -535,10 +809,16 @@ static struct validate spob_validate = /* SET_POBOX */ set_pobox, }; +struct valobj spop_valobj[] = { + {V_LOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_RLOCK, 0, MACHINE_TABLE, 0, MACH_ID, MR_DEADLOCK}, + {V_ID, 0, USERS_TABLE, LOGIN, USERS_ID, MR_USER}, +}; + static struct validate spop_validate = /* SET_POBOX_POP */ { - VOuser0lock, - 2, + spop_valobj, + 3, 0, 0, 0, @@ -550,8 +830,8 @@ static struct validate spop_validate = /* SET_POBOX_POP */ static struct validate dpob_validate = /* DELETE_POBOX */ { - VOuser0lock, - 2, + spop_valobj, + 3, 0, 0, 0, @@ -566,64 +846,126 @@ static char *gmac_fields[] = { NAME, TYPE, MOD1, MOD2, MOD3, }; -static char *amac_fields[] = { - NAME, TYPE +static char *ghst_fields[] = { + NAME, ADDRESS, "location", "network", + NAME, "vendor", "model", "os", "location", "contact", "use", "status", "status_change", "network", ADDRESS, ACE_TYPE, ACE_NAME, "admin_comment", "ops_comment", "created", "creator", "inuse", MOD1, MOD2, MOD3, }; -static struct valobj amac_valobj[] = { - {V_CHAR, 0}, - {V_LOCK, 0, MACHINE, 0, MACH_ID, MR_DEADLOCK}, - {V_TYPE, 1, "mac_type", 0, 0, MR_TYPE}, +static struct valobj ghst_valobj[] = { + {V_UPWILD, 0}, + {V_UPWILD, 1}, + {V_UPWILD, 2}, + {V_UPWILD, 3}, }; -static struct validate amac_validate = { - amac_valobj, - 3, +static struct validate ghst_validate = { + ghst_valobj, + 4, + 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 ahst_valobj[] = { + {V_RLOCK,0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_LOCK, 0, MACHINE_TABLE, 0, MACH_ID, MR_DEADLOCK}, + {V_RLOCK, 0, SUBNET_TABLE, 0, SNET_ID, MR_DEADLOCK}, + {V_RLOCK, 0, LIST_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_RLOCK, 0, HOSTALIAS_TABLE, 0, MACH_ID, MR_DEADLOCK}, + {V_CHAR, 0, MACHINE_TABLE, NAME}, + {V_CHAR, 1, MACHINE_TABLE, "vendor"}, + {V_CHAR, 2, MACHINE_TABLE, "model"}, + {V_CHAR, 3, MACHINE_TABLE, "os"}, + {V_CHAR, 4, MACHINE_TABLE, "location"}, + {V_CHAR, 5, MACHINE_TABLE, "contact"}, + {V_NUM, 6}, + {V_NUM, 7}, + {V_ID, 8, SUBNET_TABLE, NAME, SNET_ID, MR_SUBNET}, + {V_TYPE, 10, 0, ACE_TYPE, 0, MR_ACE}, + {V_TYPEDATA, 11, 0, 0, 0, MR_ACE}, + {V_ID, 12, STRINGS_TABLE, "string", "string_id", MR_NO_MATCH}, + {V_ID, 13, STRINGS_TABLE, "string", "string_id", MR_NO_MATCH}, +}; + +static struct validate ahst_validate = { + ahst_valobj, + 18, NAME, - "imembers.name = uppercase('%s')", + "name = UPPER('%s')", 1, MACH_ID, - 0, - 0, + 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}, - {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}, +static struct valobj uhst_valobj[] = { + {V_RLOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_LOCK, 0, MACHINE_TABLE, 0, MACH_ID, MR_DEADLOCK}, + {V_RLOCK, 0, SUBNET_TABLE, 0, SNET_ID, MR_DEADLOCK}, + {V_RLOCK, 0, LIST_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_CHAR, 0, MACHINE_TABLE, "name"}, + {V_ID, 0, MACHINE_TABLE, NAME, MACH_ID, MR_MACHINE}, + {V_RENAME, 1, MACHINE_TABLE, NAME, MACH_ID, MR_NOT_UNIQUE}, + {V_CHAR, 2, MACHINE_TABLE, "vendor"}, + {V_CHAR, 3, MACHINE_TABLE, "model"}, + {V_CHAR, 4, MACHINE_TABLE, "os"}, + {V_CHAR, 5, MACHINE_TABLE, "location"}, + {V_CHAR, 6, MACHINE_TABLE, "contact"}, + {V_NUM, 7}, + {V_NUM, 8}, + {V_ID, 9, SUBNET_TABLE, NAME, SNET_ID, MR_SUBNET}, + {V_TYPE, 11, 0, ACE_TYPE, 0, MR_ACE}, + {V_TYPEDATA, 12, 0, 0, 0, MR_ACE}, + {V_ID, 13, STRINGS_TABLE, "string", "string_id", MR_NO_MATCH}, + {V_ID, 14, STRINGS_TABLE, "string", "string_id", MR_NO_MATCH}, }; -static struct validate umac_validate = { - umac_valobj, - 4, +static struct validate uhst_validate = { + uhst_valobj, + 19, 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[] = { - {V_LOCK, 0, MACHINE, 0, MACH_ID, MR_DEADLOCK}, - {V_ID, 0, MACHINE, NAME, MACH_ID, MR_MACHINE}, +static struct valobj dhst_valobj[] = { + {V_RLOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_LOCK, 0, MACHINE_TABLE, 0, MACH_ID, MR_DEADLOCK}, + {V_RLOCK, 0, NFSPHYS_TABLE, 0, "nfsphys_id", MR_DEADLOCK}, + {V_RLOCK, 0, SERVERHOSTS_TABLE, 0, MACH_ID, MR_DEADLOCK}, + {V_RLOCK, 0, HOSTACCESS_TABLE, 0, MACH_ID, MR_DEADLOCK}, + {V_RLOCK, 0, HOSTALIAS_TABLE, 0, MACH_ID, MR_DEADLOCK}, + {V_LOCK, 0, MCMAP_TABLE, 0, MACH_ID, MR_DEADLOCK}, + {V_RLOCK, 0, PRINTCAP_TABLE, 0, MACH_ID, MR_DEADLOCK}, + {V_RLOCK, 0, PALLADIUM_TABLE, 0, MACH_ID, MR_DEADLOCK}, + {V_ID, 0, MACHINE_TABLE, NAME, MACH_ID, MR_MACHINE}, }; -static struct validate dmac_validate = { - dmac_valobj, - 2, +static struct validate dhst_validate = { + dhst_valobj, + 10, 0, 0, 0, @@ -633,70 +975,245 @@ static struct validate dmac_validate = { 0, }; -static char *gclu_fields[] = { - NAME, - NAME, DESC, LOCATION, MOD1, MOD2, MOD3, +static char *ghal_fields[] = { + ALIAS, "canonical_hostname", + ALIAS, "canonical_hostname" }; -static char *aclu_fields[] = { - NAME, DESC, LOCATION, -}; - -static struct valobj aclu_valobj[] = { - {V_LOCK, 0, CLUSTER, 0, CLU_ID, MR_DEADLOCK}, - {V_CHAR, 0} +static struct valobj ghal_valobj[] = { + {V_UPWILD, 0}, + {V_UPWILD, 1}, }; -static struct validate aclu_validate = /* for aclu */ -{ - aclu_valobj, +static struct validate ghal_validate = { + ghal_valobj, 2, - NAME, - "clusters.name = '%s'", - 1, - CLU_ID, 0, 0, - set_modtime, + 0, + 0, + access_ahal, + 0, + 0, }; -static char *uclu_fields[] = { +static struct valobj ahal_valobj[] = { + {V_CHAR, 0, HOSTALIAS_TABLE, NAME}, + {V_UPWILD, 0}, + {V_ID, 1, MACHINE_TABLE, NAME, MACH_ID, MR_MACHINE}, +}; + +static struct validate ahal_validate = { + ahal_valobj, + 3, NAME, - "newname", DESC, LOCATION, + "name = '%s'", + 1, + MACH_ID, + access_ahal, + setup_ahal, + 0, }; -static struct valobj uclu_valobj[] = { - {V_LOCK, 0, CLUSTER, 0, CLU_ID, MR_DEADLOCK}, - {V_ID, 0, CLUSTER, NAME, CLU_ID, MR_CLUSTER}, - {V_RENAME, 1, CLUSTER, NAME, CLU_ID, MR_NOT_UNIQUE}, +static struct valobj dhal_valobj[] = { + {V_UPWILD, 0}, + {V_LOCK, 0, MACHINE_TABLE, 0, MACH_ID, MR_DEADLOCK}, + {V_ID, 1, MACHINE_TABLE, NAME, MACH_ID, MR_MACHINE}, }; -static struct validate uclu_validate = { - uclu_valobj, +static struct validate dhal_validate = { + dhal_valobj, 3, + NAME, + "name = '%s' AND mach_id = %d", + 2, + MACH_ID, + access_ahal, 0, 0, - 0, - CLU_ID, - 0, - 0, - set_modtime_by_id, }; -static char *dclu_fields[] = { - NAME, +static char *gsnt_fields[] = { + NAME, + NAME, DESC, ADDRESS, "mask", "low", "high", "prefix", ACE_TYPE, ACE_NAME, + MOD1, MOD2, MOD3 }; -static struct validate dclu_validate = { - VOclu0, +static struct valobj gsnt_valobj[] = { + {V_RLOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_RLOCK, 0, SUBNET_TABLE, 0, SNET_ID, MR_DEADLOCK}, + {V_RLOCK, 0, LIST_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_UPWILD, 0}, +}; + +static struct validate gsnt_validate = { + gsnt_valobj, + 4, + 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_RLOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_LOCK, 0, SUBNET_TABLE, 0, SNET_ID, MR_DEADLOCK}, + {V_RLOCK, 0, LIST_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_CHAR, 0, SUBNET_TABLE, NAME}, + {V_LEN, 1, SUBNET_TABLE, DESC}, + {V_NUM, 2}, + {V_NUM, 3}, + {V_NUM, 4}, + {V_NUM, 5}, + {V_LEN, 6, SUBNET_TABLE, "prefix"}, + {V_TYPE, 7, 0, ACE_TYPE, 0, MR_ACE}, + {V_TYPEDATA, 8, 0, 0, 0, MR_ACE}, +}; + +static struct validate asnt_validate = +{ + asnt_valobj, + 12, + NAME, + "name = UPPER('%s')", 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_RLOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_LOCK, 0, SUBNET_TABLE, 0, SNET_ID, MR_DEADLOCK}, + {V_RLOCK, 0, LIST_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_ID, 0, SUBNET_TABLE, NAME, SNET_ID, MR_NO_MATCH}, + {V_RENAME, 1, SUBNET_TABLE, NAME, SNET_ID, MR_NOT_UNIQUE}, + {V_LEN, 2, SUBNET_TABLE, DESC}, + {V_NUM, 3}, + {V_NUM, 4}, + {V_NUM, 5}, + {V_NUM, 6}, + {V_LEN, 7, SUBNET_TABLE, "prefix"}, + {V_TYPE, 8, 0, ACE_TYPE, 0, MR_ACE}, + {V_TYPEDATA, 9, 0, 0, 0, MR_ACE}, +}; + +static struct validate usnt_validate = +{ + usnt_valobj, + 13, + NAME, + "snet_id = %d", + 1, + SNET_ID, 0, 0, - 0, - 0, - setup_dclu, - 0, + set_modtime_by_id, +}; + +static char *dsnt_fields[] = { + NAME, +}; + +static struct valobj dsnt_valobj[] = { + {V_RLOCK, 0, MACHINE_TABLE, 0, MACH_ID, MR_DEADLOCK}, + {V_LOCK, 0, SUBNET_TABLE, 0, SNET_ID, MR_DEADLOCK}, + {V_ID, 0, SUBNET_TABLE, NAME, SNET_ID, MR_SUBNET}, +}; + +static struct validate dsnt_validate = { + dsnt_valobj, + 3, + 0, + 0, + 0, + 0, + 0, + setup_dsnt, + 0, +}; + +static char *gclu_fields[] = { + NAME, + NAME, DESC, LOCATION, MOD1, MOD2, MOD3, +}; + +static char *aclu_fields[] = { + NAME, DESC, LOCATION, +}; + +static struct valobj aclu_valobj[] = { + {V_LOCK, 0, CLUSTER_TABLE, 0, CLU_ID, MR_DEADLOCK}, + {V_CHAR, 0, CLUSTER_TABLE, NAME}, + {V_LEN, 1, CLUSTER_TABLE, DESC}, + {V_LEN, 2, CLUSTER_TABLE, LOCATION}, +}; + +static struct validate aclu_validate = +{ + aclu_valobj, + 4, + NAME, + "name = '%s'", + 1, + CLU_ID, + 0, + prefetch_value, + set_modtime, +}; + +static char *uclu_fields[] = { + NAME, + "newname", DESC, LOCATION, +}; + +static struct valobj uclu_valobj[] = { + {V_LOCK, 0, CLUSTER_TABLE, 0, CLU_ID, MR_DEADLOCK}, + {V_ID, 0, CLUSTER_TABLE, NAME, CLU_ID, MR_CLUSTER}, + {V_RENAME, 1, CLUSTER_TABLE, NAME, CLU_ID, MR_NOT_UNIQUE}, + {V_LEN, 2, CLUSTER_TABLE, DESC}, + {V_LEN, 3, CLUSTER_TABLE, LOCATION}, +}; + +static struct validate uclu_validate = { + uclu_valobj, + 5, + 0, + 0, + 0, + CLU_ID, + 0, + 0, + set_modtime_by_id, +}; + +static char *dclu_fields[] = { + NAME, +}; + +static struct validate dclu_validate = { + VOclu0, + 1, + 0, + 0, + 0, + 0, + 0, + setup_dclu, + 0, }; static char *gmcm_fields[] = { @@ -704,10 +1221,18 @@ static char *gmcm_fields[] = { MACHINE, CLUSTER, }; +static struct valobj gmcm_valobj[] = +{ + {V_UPWILD, 0}, + {V_WILD, 1}, +}; + +static struct validate gmcm_validate = { gmcm_valobj, 2 }; + static struct valobj amtc_valobj[] = /* ADD_MACHINE_TO_CLUSTER */ { /* DELETE_MACHINE_FROM_CLUSTER */ - {V_ID, 0, MACHINE, NAME, MACH_ID, MR_MACHINE}, - {V_ID, 1, CLUSTER, NAME, CLU_ID, MR_CLUSTER}, + {V_ID, 0, MACHINE_TABLE, NAME, MACH_ID, MR_MACHINE}, + {V_ID, 1, CLUSTER_TABLE, NAME, CLU_ID, MR_CLUSTER}, }; static struct validate amtc_validate = /* for amtc and dmfc */ @@ -715,7 +1240,7 @@ static struct validate amtc_validate = /* for amtc and dmfc */ amtc_valobj, 2, MACH_ID, - "imembers.mach_id = %d and imembers.clu_id = %d", + "mach_id = %d and clu_id = %d", 2, 0, 0, @@ -734,16 +1259,35 @@ static char *acld_fields[] = { static struct valobj acld_valobj[] = { - {V_ID, 0, CLUSTER, NAME, CLU_ID, MR_CLUSTER}, - {V_CHAR, 2}, + {V_ID, 0, CLUSTER_TABLE, NAME, CLU_ID, MR_CLUSTER}, + {V_CHAR, 1, SVC_TABLE, "serv_label"}, + {V_CHAR, 2, SVC_TABLE, "serv_cluster"} }; -static struct validate acld_validate = /* ADD_CLUSTER_DATA */ -{ /* DELETE_CLUSTER_DATA */ +static struct validate acld_validate = +{ acld_valobj, - 2, + 3, + CLU_ID, + "clu_id = %d AND serv_label = '%s' AND serv_cluster = '%s'", + 3, + 0, + 0, + 0, + set_cluster_modtime_by_id, +}; + +static struct valobj dcld_valobj[] = +{ + {V_ID, 0, CLUSTER_TABLE, NAME, CLU_ID, MR_CLUSTER}, +}; + +static struct validate dcld_validate = +{ + dcld_valobj, + 1, 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, @@ -751,6 +1295,284 @@ static struct validate acld_validate = /* ADD_CLUSTER_DATA */ set_cluster_modtime_by_id, }; +static char *glin_fields[] = { + NAME, + NAME, "active", "publicflg", "hidden", "maillist", "grouplist", "gid", + ACE_TYPE, ACE_NAME, DESC, MOD1, MOD2, MOD3, +}; + +static struct validate glin_validate = { + 0, + 0, + 0, + 0, + 0, + 0, + access_vis_list_by_name, + 0, + get_list_info, +}; + +static char *alis_fields[] = { + NAME, "active", "publicflg", "hidden", "maillist", "grouplist", "gid", + ACE_TYPE, ACE_NAME, DESC, +}; + +static struct valobj alis_valobj[] = { + {V_RLOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_LOCK, 0, LIST_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_CHAR, 0, LIST_TABLE, NAME}, + {V_NUM, 1}, + {V_NUM, 2}, + {V_NUM, 3}, + {V_NUM, 4}, + {V_NUM, 5}, + {V_NUM, 6}, + {V_TYPE, 7, 0, ACE_TYPE, 0, MR_ACE}, + {V_TYPEDATA, 8, 0, 0, LIST_ID, MR_ACE}, + {V_LEN, 9, LIST_TABLE, DESC}, +}; + +static struct validate alis_validate = { + alis_valobj, + 12, + NAME, + "name = '%s'", + 1, + LIST_ID, + 0, + setup_alis, + set_modtime, +}; + +static char *ulis_fields[] = { + NAME, + "newname", "active", "publicflg", "hidden", "maillist", "grouplist", "gid", + ACE_TYPE, ACE_NAME, DESC, +}; + +static struct valobj ulis_valobj[] = { + {V_RLOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_LOCK, 0, LIST_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_ID, 0, LIST_TABLE, NAME, LIST_ID, MR_LIST}, + {V_RENAME, 1, LIST_TABLE, NAME, LIST_ID, MR_NOT_UNIQUE}, + {V_NUM, 2}, + {V_NUM, 3}, + {V_NUM, 4}, + {V_NUM, 5}, + {V_NUM, 6}, + {V_NUM, 7}, + {V_TYPE, 8, 0, ACE_TYPE, 0, MR_ACE}, + {V_TYPEDATA, 9, 0, 0, LIST_ID, MR_ACE}, + {V_LEN, 10, LIST_TABLE, DESC}, +}; + +static struct validate ulis_validate = { + ulis_valobj, + 13, + NAME, + "list_id = %d", + 1, + LIST_ID, + access_list, + setup_alis, + set_modtime_by_id, +}; + +static char *dlis_fields[] = { + NAME, +}; + +static struct valobj dlis_valobj[] ={ + {V_RLOCK, 0, CAPACLS_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_RLOCK, 0, IMEMBERS_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_RLOCK, 0, FILESYS_TABLE, 0, FILSYS_ID, MR_DEADLOCK}, + {V_LOCK, 0, LIST_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_RLOCK, 0, QUOTA_TABLE, 0, FILSYS_ID, MR_DEADLOCK}, + {V_RLOCK, 0, ZEPHYR_TABLE, 0, ZEPH_ID, MR_DEADLOCK}, + {V_RLOCK, 0, HOSTACCESS_TABLE, 0, MACH_ID, MR_DEADLOCK}, + {V_ID, 0, LIST_TABLE, NAME, LIST_ID, MR_LIST} +}; + +static struct validate dlis_validate = { + dlis_valobj, + 8, + NAME, + "list_id = %d", + 1, + 0, + access_list, + setup_dlis, + 0, +}; + +static char *amtl_fields[] = { + "list_name", "member_type", "member_name", +}; + +static struct valobj amtl_valobj[] = { + {V_RLOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_LOCK, 0, LIST_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_ID, 0, LIST_TABLE, NAME, LIST_ID, MR_LIST}, + {V_TYPE, 1, 0, "member", 0, MR_TYPE}, + {V_TYPEDATA, 2, 0, 0, 0, MR_NO_MATCH}, +}; + +static struct validate amtl_validate = +{ + amtl_valobj, + 5, + 0, + 0, + 0, + 0, + access_list, + 0, + add_member_to_list, +}; + +static struct validate dmfl_validate = +{ + amtl_valobj, + 5, + 0, + 0, + 0, + 0, + access_list, + 0, + delete_member_from_list, +}; + +static char *gaus_fields[] = { + ACE_TYPE, ACE_NAME, + "use_type", "use_name", +}; + +static struct valobj gaus_valobj[] = { + {V_RLOCK, 0, FILESYS_TABLE, 0, FILSYS_ID, MR_DEADLOCK}, + {V_RLOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_RLOCK, 0, LIST_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_RLOCK, 0, ZEPHYR_TABLE, 0, ZEPH_ID, MR_DEADLOCK}, + {V_RLOCK, 0, HOSTACCESS_TABLE, 0, MACH_ID, MR_DEADLOCK}, + {V_TYPE, 0, 0, "gaus", 0, MR_TYPE}, + {V_TYPEDATA, 1, 0, 0, 0, MR_NO_MATCH}, +}; + +static struct validate gaus_validate = { + gaus_valobj, + 7, + 0, + 0, + 0, + 0, + access_member, + 0, + get_ace_use, +}; + +static char *qgli_fields[] = { + "active", "publicflg", "hidden", "maillist", "grouplist", + "list", +}; + +static struct valobj qgli_valobj[] = { + {V_TYPE, 0, 0, "boolean", 0, MR_TYPE}, + {V_TYPE, 1, 0, "boolean", 0, MR_TYPE}, + {V_TYPE, 2, 0, "boolean", 0, MR_TYPE}, + {V_TYPE, 3, 0, "boolean", 0, MR_TYPE}, + {V_TYPE, 4, 0, "boolean", 0, MR_TYPE}, +}; + +static struct validate qgli_validate = { + qgli_valobj, + 5, + 0, + 0, + 0, + 0, + access_qgli, + 0, + qualified_get_lists, +}; + +static char *gmol_fields[] = { + "list_name", + "member_type", "member_name", +}; + +static struct valobj gmol_valobj[]={ + {V_LOCK, 0, IMEMBERS_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_RLOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_ID, 0, LIST_TABLE, NAME, LIST_ID, MR_LIST}, + +}; +static struct validate gmol_validate = { + gmol_valobj, + 3, + 0, + 0, + 0, + 0, + access_visible_list, + 0, + get_members_of_list, +}; + +static struct validate geml_validate = { + gmol_valobj, + 3, + 0, + 0, + 0, + 0, + access_visible_list, + 0, + get_end_members_of_list, +}; + +static char *glom_fields[] = { + "member_type", "member_name", + "list_name", "active", "publicflg", "hidden", "maillist", "grouplist", +}; + +static struct valobj glom_valobj[] = { + {V_LOCK, 0, IMEMBERS_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_RLOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_RLOCK, 0, LIST_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_TYPE, 0, 0, "rmember", 0, MR_TYPE}, + {V_TYPEDATA, 1, 0, 0, 0, MR_NO_MATCH}, +}; + +static struct validate glom_validate = { + glom_valobj, + 5, + 0, + 0, + 0, + 0, + access_member, + 0, + get_lists_of_member, +}; + +static char *cmol_fields[] = { + "list_name", + "count", +}; + +static struct validate cmol_validate = { + VOlist0, + 1, + 0, + 0, + 0, + 0, + access_visible_list, + 0, + count_members_of_list, +}; + static char *gsin_fields[] = { SERVICE, SERVICE, "update_int", "target_file", "script", "dfgen", "dfcheck", @@ -758,40 +1580,47 @@ static char *gsin_fields[] = { ACE_TYPE, ACE_NAME, MOD1, MOD2, MOD3, }; +static struct valobj gsin_valobj[] = +{ + {V_RLOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_RLOCK, 0, LIST_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_UPWILD, 0 }, +}; + static struct validate gsin_validate = { - 0, - 0, - 0, - 0, - 0, - 0, - access_service, - 0, - followup_glin, + gsin_valobj, + 3, + 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[] = { - {V_TYPE, 0, "boolean", 0, 0, MR_TYPE}, - {V_TYPE, 1, "boolean", 0, 0, MR_TYPE}, - {V_TYPE, 2, "boolean", 0, 0, MR_TYPE}, + {V_TYPE, 0, 0, "boolean", 0, MR_TYPE}, + {V_TYPE, 1, 0, "boolean", 0, MR_TYPE}, + {V_TYPE, 2, 0, "boolean", 0, MR_TYPE}, }; 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[] = { @@ -800,19 +1629,25 @@ static char *asin_fields[] = { }; static struct valobj asin_valobj[] = { - {V_LOCK, 0, MACHINE, 0, MACH_ID, MR_DEADLOCK}, - {V_CHAR, 0}, - {V_TYPE, 4, "service", 0, 0, MR_TYPE}, - {V_TYPE, 6, ACE_TYPE, 0, 0, MR_ACE}, + {V_RLOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_LOCK, 0, MACHINE_TABLE, 0, MACH_ID, MR_DEADLOCK}, + {V_RLOCK, 0, LIST_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_CHAR, 0, SERVERS_TABLE, NAME}, + {V_NUM, 1}, + {V_LEN, 2, SERVERS_TABLE, "target_file"}, + {V_LEN, 3, SERVERS_TABLE, "script"}, + {V_TYPE, 4, 0, "service", 0, MR_TYPE}, + {V_NUM, 5}, + {V_TYPE, 6, 0, ACE_TYPE, 0, MR_ACE}, {V_TYPEDATA, 7, 0, 0, 0, MR_ACE}, }; static struct validate asin_validate = /* for asin, usin */ { asin_valobj, - 5, + 11, NAME, - "services.name = uppercase('%s')", + "name = UPPER('%s')", 1, 0, 0, @@ -822,9 +1657,9 @@ static struct validate asin_validate = /* for asin, usin */ static struct validate rsve_validate = { asin_valobj, - 1, + 3, NAME, - "services.name = uppercase('%s')", + "name = UPPER('%s')", 1, 0, access_service, @@ -836,11 +1671,22 @@ static char *ssif_fields[] = { SERVICE, "dfgen", "dfcheck", "inprogress", "harderror", "errmsg", }; +static struct valobj ssif_valobj[] = { + {V_RLOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_LOCK, 0, MACHINE_TABLE, 0, MACH_ID, MR_DEADLOCK}, + {V_RLOCK, 0, LIST_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_NUM, 1}, + {V_NUM, 2}, + {V_NUM, 3}, + {V_NUM, 4}, + {V_LEN, 5, SERVERS_TABLE, "errmsg"}, +}; + static struct validate ssif_validate = { - asin_valobj, - 1, + ssif_valobj, + 8, NAME, - "services.name = uppercase('%s')", + "name = UPPER('%s')", 1, 0, 0, @@ -854,9 +1700,9 @@ static char *dsin_fields[] = { static struct validate dsin_validate = { asin_valobj, - 1, + 3, NAME, - "services.name = uppercase('%s')", + "name = UPPER('%s')", 1, 0, 0, @@ -871,9 +1717,14 @@ static char *gshi_fields[] = { "value3", MOD1, MOD2, MOD3, }; +static struct valobj gshi_valobj[] = { + { V_UPWILD, 0 }, + { V_UPWILD, 1 }, +}; + static struct validate gshi_validate = { - 0, - 0, + gshi_valobj, + 2, 0, 0, 0, @@ -884,28 +1735,28 @@ 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[] = { - {V_TYPE, 1, "boolean", 0, 0, MR_TYPE}, - {V_TYPE, 2, "boolean", 0, 0, MR_TYPE}, - {V_TYPE, 3, "boolean", 0, 0, MR_TYPE}, - {V_TYPE, 4, "boolean", 0, 0, MR_TYPE}, - {V_TYPE, 5, "boolean", 0, 0, MR_TYPE}, + {V_TYPE, 1, 0, "boolean", 0, MR_TYPE}, + {V_TYPE, 2, 0, "boolean", 0, MR_TYPE}, + {V_TYPE, 3, 0, "boolean", 0, MR_TYPE}, + {V_TYPE, 4, 0, "boolean", 0, MR_TYPE}, + {V_TYPE, 5, 0, "boolean", 0, MR_TYPE}, }; 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[] = { @@ -913,17 +1764,23 @@ static char *ashi_fields[] = { }; static struct valobj ashi_valobj[] = { - {V_LOCK, 0, MACHINE, 0, MACH_ID, MR_DEADLOCK}, - {V_NAME, 0, "servers", NAME, 0, MR_SERVICE}, - {V_ID, 1, MACHINE, NAME, MACH_ID, MR_MACHINE}, + {V_LOCK, 0, MACHINE_TABLE, 0, MACH_ID, MR_DEADLOCK}, + {V_NAME, 0, SERVERS_TABLE, NAME, 0, MR_SERVICE}, + {V_LOCK, 0, SERVERHOSTS_TABLE,0, MACH_ID, MR_DEADLOCK}, + {V_CHAR, 0, SERVERHOSTS_TABLE, NAME}, + {V_ID, 1, MACHINE_TABLE, NAME, MACH_ID, MR_MACHINE}, + {V_NUM, 2}, + {V_NUM, 3}, + {V_NUM, 4}, + {V_LEN, 5, SERVERHOSTS_TABLE, "value3"}, }; static struct validate ashi_validate = /* ashi & ushi */ { ashi_valobj, - 3, + 9, SERVICE, - "serverhosts.service = uppercase('%s') and serverhosts.mach_id = %d", + "service = UPPER('%s') AND mach_id = %d", 2, 0, access_service, @@ -934,9 +1791,9 @@ static struct validate ashi_validate = /* ashi & ushi */ static struct validate rshe_validate = { ashi_valobj, - 3, + 5, SERVICE, - "serverhosts.service = uppercase('%s') and serverhosts.mach_id = %d", + "service = UPPER('%s') AND mach_id = %d", 2, 0, access_service, @@ -947,9 +1804,9 @@ static struct validate rshe_validate = static struct validate ssho_validate = { ashi_valobj, - 3, + 5, SERVICE, - "serverhosts.service = uppercase('%s') and serverhosts.mach_id = %d", + "service = UPPER('%s') AND mach_id = %d", 2, 0, access_service, @@ -958,24 +1815,33 @@ 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_RLOCK, 0, MACHINE_TABLE, 0, MACH_ID, MR_DEADLOCK}, + {V_NAME, 0, SERVERS_TABLE, NAME, 0, MR_SERVICE}, + {V_ID, 1, MACHINE_TABLE, NAME, MACH_ID, MR_MACHINE}, + {V_NUM, 2}, + {V_NUM, 3}, + {V_NUM, 4}, + {V_NUM, 5}, + {V_LEN, 6, SERVERS_TABLE, "errmsg"}, + {V_NUM, 7}, + {V_NUM, 8}, }; static struct validate sshi_validate = { sshi_valobj, - 1, + 10, + 0, 0, 0, 0, 0, 0, - setup_sshi, 0, }; @@ -986,9 +1852,9 @@ static char *dshi_fields[] = { static struct validate dshi_validate = { ashi_valobj, - 3, + 5, SERVICE, - "serverhosts.service = uppercase('%s') and serverhosts.mach_id = %d", + "service = UPPER('%s') AND mach_id = %d", 2, 0, access_service, @@ -996,47 +1862,6 @@ static struct validate dshi_validate = 0, }; -static char *gsha_fields[] = { - MACHINE, - MACHINE, ACE_TYPE, ACE_NAME, MOD1, MOD2, MOD3, -}; - -static struct validate gsha_validate = -{ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - followup_gsha, -}; - -static char *asha_fields[] = { - MACHINE, ACE_TYPE, ACE_NAME, -}; - -static struct valobj asha_valobj[] = { - {V_ID, 0, MACHINE, NAME, MACH_ID, MR_MACHINE}, - {V_TYPE, 1, ACE_TYPE, 0, 0, MR_ACE}, - {V_TYPEDATA, 2, 0, 0, 0, MR_ACE}, -}; - -static struct validate asha_validate = -{ - asha_valobj, - 3, - MACH_ID, - "hostaccess.mach_id = %d", - 1, - MACH_ID, - 0, - 0, - set_modtime_by_id, -}; - static char *gslo_fields[] = { "server", "server", MACHINE, @@ -1044,19 +1869,24 @@ static char *gslo_fields[] = { static char *gfsl_fields[] = { LABEL, - LABEL, TYPE, MACHINE, NAME, "mount", "access", "comments", "owner", "owners", + LABEL, TYPE, MACHINE, NAME, "mount", "access", COMMENTS, "owner", "owners", "create", "lockertype", MOD1, MOD2, MOD3, }; static char *gfsm_fields[] = { MACHINE, - LABEL, TYPE, MACHINE, NAME, "mount", "access", "comments", "owner", "owners", + LABEL, TYPE, MACHINE, NAME, "mount", "access", COMMENTS, "owner", "owners", "create", "lockertype", MOD1, MOD2, MOD3, }; +static struct valobj gfsm_valobj[] = { + {V_RLOCK, 0, FILESYS_TABLE, 0, FILSYS_ID, MR_DEADLOCK}, + {V_ID, 0, MACHINE_TABLE, NAME, MACH_ID, MR_MACHINE}, +}; + static struct validate gfsm_validate = { - VOmach0, - 1, + gfsm_valobj, + 2, 0, 0, 0, @@ -1068,19 +1898,49 @@ static struct validate gfsm_validate = { static char *gfsn_fields[] = { MACHINE, "parition", - LABEL, TYPE, MACHINE, NAME, "mount", "access", "comments", "owner", "owners", + LABEL, TYPE, MACHINE, NAME, "mount", "access", COMMENTS, "owner", "owners", + "create", "lockertype", MOD1, MOD2, MOD3, +}; + +static struct valobj gfsn_valobj[] = +{ + {V_RLOCK, 0, FILESYS_TABLE, 0, FILSYS_ID, MR_DEADLOCK}, + {V_ID, 0, MACHINE_TABLE, NAME, MACH_ID, MR_MACHINE}, + {V_WILD, 1}, +}; + +static struct validate gfsn_validate = { + gfsn_valobj, + 3, + 0, + 0, + 0, + 0, + 0, + 0, + followup_fix_modby, +}; + +static char *gfsp_fields[] = { + "path", + 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", + LABEL, TYPE, MACHINE, NAME, "mount", "access", COMMENTS, "owner", "owners", "create", "lockertype", MOD1, MOD2, MOD3, }; +static struct valobj gfsg_valobj[] = { + {V_RLOCK, 0, FILESYS_TABLE, 0, FILSYS_ID, MR_DEADLOCK}, + {V_ID, 0, LIST_TABLE, NAME, LIST_ID, MR_LIST} +}; + static struct validate gfsg_validate = { - VOlist0, - 1, + gfsg_valobj, + 2, 0, 0, 0, @@ -1091,26 +1951,33 @@ static struct validate gfsg_validate = { }; static char *afil_fields[] = { - LABEL, TYPE, MACHINE, NAME, "mount", "access", "comments", "owner", "owners", + LABEL, TYPE, MACHINE, NAME, "mount", "access", COMMENTS, "owner", "owners", "create", "lockertype", }; static struct valobj afil_valobj[] = { - {V_CHAR, 0}, - {V_LOCK, 0, FILESYS, 0, FILSYS_ID, MR_DEADLOCK}, - {V_TYPE, 1, FILESYS, 0, 0, MR_FSTYPE}, - {V_ID, 2, MACHINE, NAME, MACH_ID, MR_MACHINE}, - {V_CHAR, 3}, - {V_ID, 7, USERS, LOGIN, USERS_ID, MR_USER}, - {V_ID, 8, LIST, NAME, LIST_ID, MR_LIST}, - {V_TYPE, 10, "lockertype", 0, 0, MR_TYPE} + {V_LOCK, 0, FILESYS_TABLE, 0, FILSYS_ID, MR_DEADLOCK}, + {V_RLOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_RLOCK, 0, MACHINE_TABLE, 0, MACH_ID, MR_DEADLOCK}, + {V_RLOCK, 0, LIST_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_CHAR, 0, FILESYS_TABLE, LABEL}, + {V_TYPE, 1, 0, "filesys", 0, MR_FSTYPE}, + {V_ID, 2, MACHINE_TABLE, NAME, MACH_ID, MR_MACHINE}, + {V_CHAR, 3, FILESYS_TABLE, NAME}, + {V_LEN, 4, FILESYS_TABLE, "mount"}, + {V_LEN, 5, FILESYS_TABLE, "rwaccess"}, + {V_LEN, 6, FILESYS_TABLE, COMMENTS}, + {V_ID, 7, USERS_TABLE, LOGIN, USERS_ID, MR_USER}, + {V_ID, 8, LIST_TABLE, NAME, LIST_ID, MR_LIST}, + {V_NUM, 9}, + {V_TYPE, 10, 0, "lockertype", 0, MR_TYPE}, }; static struct validate afil_validate = { afil_valobj, - 8, + 15, LABEL, - "filesys.label = '%s'", + "label = '%s'", 1, FILSYS_ID, 0, @@ -1119,27 +1986,35 @@ static struct validate afil_validate = { }; static char *ufil_fields[] = { - LABEL, "newlabel", TYPE, MACHINE, NAME, "mount", "access", "comments", + LABEL, "newlabel", TYPE, MACHINE, NAME, "mount", "access", COMMENTS, "owner", "owners", "create", "lockertype", }; static struct valobj ufil_valobj[] = { - {V_LOCK, 0, FILESYS, 0, FILSYS_ID, MR_DEADLOCK}, - {V_ID, 0, FILESYS, LABEL, FILSYS_ID, MR_FILESYS}, - {V_RENAME, 1, FILESYS, LABEL, FILSYS_ID, MR_NOT_UNIQUE}, - {V_TYPE, 2, FILESYS, 0, 0, MR_FSTYPE}, - {V_ID, 3, MACHINE, NAME, MACH_ID, MR_MACHINE}, - {V_CHAR, 4}, - {V_ID, 8, USERS, LOGIN, USERS_ID, MR_USER}, - {V_ID, 9, LIST, NAME, LIST_ID, MR_LIST}, - {V_TYPE, 11, "lockertype", 0, 0, MR_TYPE} + {V_LOCK, 0, FILESYS_TABLE, 0, FILSYS_ID, MR_DEADLOCK}, + {V_RLOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_RLOCK, 0, MACHINE_TABLE, 0, MACH_ID, MR_DEADLOCK}, + {V_RLOCK, 0, LIST_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_LOCK, 0, QUOTA_TABLE, 0, FILSYS_ID, MR_DEADLOCK}, + {V_ID, 0, FILESYS_TABLE, LABEL, FILSYS_ID, MR_FILESYS}, + {V_RENAME, 1, FILESYS_TABLE, LABEL, FILSYS_ID, MR_NOT_UNIQUE}, + {V_TYPE, 2, 0, "filesys", 0, MR_FSTYPE}, + {V_ID, 3, MACHINE_TABLE, NAME, MACH_ID, MR_MACHINE}, + {V_CHAR, 4, FILESYS_TABLE, NAME}, + {V_LEN, 5, FILESYS_TABLE, "mount"}, + {V_LEN, 6, FILESYS_TABLE, "rwaccess"}, + {V_LEN, 7, FILESYS_TABLE, COMMENTS}, + {V_ID, 8, USERS_TABLE, LOGIN, USERS_ID, MR_USER}, + {V_ID, 9, LIST_TABLE, NAME, LIST_ID, MR_LIST}, + {V_NUM, 10}, + {V_TYPE, 11, 0, "lockertype", 0, MR_TYPE}, }; static struct validate ufil_validate = { ufil_valobj, - 9, + 17, LABEL, - "filesys.filsys_id = %d", + "filsys_id = %d", 1, FILSYS_ID, 0, @@ -1152,15 +2027,18 @@ static char *dfil_fields[] = { }; static struct valobj dfil_valobj[] = { - {V_LOCK, 0, FILESYS, 0, FILSYS_ID, MR_DEADLOCK}, - {V_ID, 0, FILESYS, LABEL, FILSYS_ID, MR_FILESYS}, + {V_LOCK, 0, FILESYS_TABLE, 0, FILSYS_ID, MR_DEADLOCK}, + {V_LOCK, 0, NFSPHYS_TABLE, 0, "nfsphys_id", MR_DEADLOCK}, + {V_LOCK, 0, QUOTA_TABLE, 0, FILSYS_ID, MR_DEADLOCK}, + {V_LOCK, 0, FSGROUP_TABLE, 0, "filsys_id", MR_DEADLOCK}, + {V_ID, 0, FILESYS_TABLE, LABEL, FILSYS_ID, MR_FILESYS}, }; static struct validate dfil_validate = { dfil_valobj, - 2, + 5, "label", - "filesys.filsys_id = %d", + "filsys_id = %d", 1, 0, 0, @@ -1169,43 +2047,42 @@ 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_TABLE, LABEL, FILSYS_ID, MR_FILESYS}, }; - -static struct validate gfgm_validate = { - gfgm_valobj, - 3, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + +static struct validate gfgm_validate = { + gfgm_valobj, + 1, + 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_TABLE, 0, FILSYS_ID, MR_DEADLOCK}, + {V_LOCK, 0, FSGROUP_TABLE, 0, "filsys_id", MR_DEADLOCK}, + {V_ID, 0, FILESYS_TABLE, LABEL, FILSYS_ID, MR_FILESYS}, + {V_ID, 1, FILESYS_TABLE, LABEL, FILSYS_ID, MR_FILESYS}, }; static struct validate aftg_validate = { - aftg_valobj, - 3, - "group_id", - "fsgroup.group_id = %d and fsgroup.filsys_id = %d", - 2, - 0, - 0, - 0, - 0, + aftg_valobj, + 4, + "group_id", + "group_id = %d and filsys_id = %d", + 2, + 0, + 0, + 0, + 0, }; static char *ganf_fields[] = { @@ -1217,9 +2094,15 @@ static char *gnfp_fields[] = { MACHINE, DIR, DEVICE, STATUS, "allocated", "size", MOD1, MOD2, MOD3, }; +static struct valobj gnfp_valobj[] = { + {V_ID, 0, MACHINE_TABLE, NAME, MACH_ID, MR_MACHINE}, + {V_RLOCK, 0, NFSPHYS_TABLE, 0, "nfsphys_id", MR_DEADLOCK}, + {V_WILD, 1}, +}; + static struct validate gnfp_validate = { - VOmach0, - 1, + gnfp_valobj, + 3, 0, 0, 0, @@ -1230,15 +2113,57 @@ static struct validate gnfp_validate = { }; static struct valobj anfp_valobj[] = { - {V_ID, 0, MACHINE, NAME, MACH_ID, MR_MACHINE}, - {V_CHAR, 1}, + {V_RLOCK, 0, MACHINE_TABLE, 0, MACH_ID, MR_DEADLOCK}, + {V_LOCK, 0, NFSPHYS_TABLE, 0, "nfsphys_id", MR_DEADLOCK}, + {V_ID, 0, MACHINE_TABLE, NAME, MACH_ID, MR_MACHINE}, + {V_CHAR, 1, NFSPHYS_TABLE, "dir"}, + {V_LEN, 2, NFSPHYS_TABLE, "device"}, + {V_NUM, 3}, + {V_NUM, 4}, + {V_NUM, 5}, }; static struct validate anfp_validate = { anfp_valobj, + 8, + DIR, + "mach_id = %d and dir = '%s'", + 2, + "nfsphys_id", + 0, + prefetch_value, + set_nfsphys_modtime, +}; + +static struct validate unfp_validate = { + anfp_valobj, + 8, + DIR, + "mach_id = %d and dir = '%s'", 2, + "nfsphys_id", + 0, + 0, + set_nfsphys_modtime, +}; + +static char *ajnf_fields[] = { + MACHINE, DIR, "adjustment", +}; + +static struct valobj ajnf_valobj[] = { + {V_RLOCK, 0, MACHINE_TABLE, 0, MACH_ID, MR_DEADLOCK}, + {V_LOCK, 0, NFSPHYS_TABLE, 0, "nfsphys_id", MR_DEADLOCK}, + {V_ID, 0, MACHINE_TABLE, NAME, MACH_ID, MR_MACHINE}, + {V_CHAR, 1, NFSPHYS_TABLE, "dir"}, + {V_NUM, 2}, +}; + +static struct validate ajnf_validate = { + ajnf_valobj, + 5, DIR, - "nfsphys.mach_id = %d and nfsphys.dir = '%s'", + "mach_id = %d and dir = '%s'", 2, "nfsphys_id", 0, @@ -1250,11 +2175,18 @@ static char *dnfp_fields[] = { MACHINE, DIR, }; +static struct valobj dnfp_valobj[] = { + {V_RLOCK, 0, FILESYS_TABLE, 0, FILSYS_ID, MR_DEADLOCK}, + {V_LOCK, 0, MACHINE_TABLE, 0, MACH_ID, MR_DEADLOCK}, + {V_LOCK, 0, NFSPHYS_TABLE, 0, "nfsphys_id", MR_DEADLOCK}, + {V_ID, 0, MACHINE_TABLE, NAME, MACH_ID, MR_MACHINE}, +}; + static struct validate dnfp_validate = { - VOmach0, - 1, + dnfp_valobj, + 4, DIR, - "nfsphys.mach_id = %d and nfsphys.dir = '%s'", + "mach_id = %d and dir = '%s'", 2, "nfsphys_id", 0, @@ -1268,14 +2200,19 @@ static char *gqot_fields[] = { }; static struct valobj gqot_valobj[] = { - {V_TYPE, 1, QUOTA_TYPE, 0, 0, MR_TYPE}, + {V_RLOCK, 0, FILESYS_TABLE, 0, FILSYS_ID, MR_DEADLOCK}, + {V_RLOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_RLOCK, 0, LIST_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_RLOCK, 0, NFSPHYS_TABLE, 0, "nfsphys_id", MR_DEADLOCK}, + {V_RLOCK, 0, QUOTA_TABLE, 0, FILSYS_ID, MR_DEADLOCK}, + {V_WILD, 0}, + {V_TYPE, 1, 0, QUOTA_TYPE, 0, MR_TYPE}, {V_TYPEDATA, 2, 0, 0, 0, MR_ACE}, - {V_SORT, 0, 0, 0, 0, 0}, }; static struct validate gqot_validate = { gqot_valobj, - 3, + 8, 0, 0, 0, @@ -1291,7 +2228,7 @@ static char *gqbf_fields[] = { }; static struct validate gqbf_validate = { - VOsort0, + VOwild0, 1, 0, 0, @@ -1307,29 +2244,34 @@ static char *aqot_fields[] = { }; static struct valobj aqot_valobj[] = { - {V_LOCK, 0, FILESYS, 0, FILSYS_ID, MR_DEADLOCK}, - {V_ID, 0, FILESYS, LABEL, FILSYS_ID, MR_FILESYS}, - {V_TYPE, 1, QUOTA_TYPE, 0, 0, MR_TYPE}, + {V_LOCK, 0, FILESYS_TABLE, 0, FILSYS_ID, MR_DEADLOCK}, + {V_RLOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_RLOCK, 0, LIST_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_LOCK, 0, NFSPHYS_TABLE, 0, "nfsphys_id", MR_DEADLOCK}, + {V_LOCK, 0, QUOTA_TABLE, 0, FILSYS_ID, MR_DEADLOCK}, + {V_ID, 0, FILESYS_TABLE, LABEL, FILSYS_ID, MR_FILESYS}, + {V_TYPE, 1, 0, QUOTA_TYPE, 0, MR_TYPE}, {V_TYPEDATA, 2, 0, 0, 0, MR_ACE}, + {V_NUM, 3}, }; static struct validate aqot_validate = { aqot_valobj, - 4, + 9, 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, - 0, + prefetch_filesys, followup_aqot, }; static struct validate uqot_validate = { aqot_valobj, - 4, + 9, 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, @@ -1339,14 +2281,14 @@ static struct validate uqot_validate = { static struct validate dqot_validate = { aqot_valobj, - 4, + 8, 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[] = { @@ -1355,7 +2297,7 @@ static char *gnfq_fields[] = { }; static struct validate gnfq_validate = { - VOsort0, + VOwild0, 1, 0, 0, @@ -1371,280 +2313,75 @@ static char *gnqp_fields[] = { FILESYS, LOGIN, QUOTA, DIR, MACHINE, MOD1, MOD2, MOD3, }; -static char *anfq_fields[] = { - FILESYS, LOGIN, QUOTA, -}; - -static struct validate anfq_validate = { - VOfilsys0user1, - 3, - FILSYS_ID, - "quota.filsys_id = %d and quota.type = 'USER' and quota.entity_id = %d", - 2, - 0, - 0, - 0, - followup_aqot, -}; - -static struct validate unfq_validate = { - VOfilsys0user1, - 3, - FILSYS_ID, - "quota.filsys_id = %d and quota.type = 'USER' and quota.entity_id = %d", - 2, - 0, - 0, - setup_dqot, - followup_aqot, -}; - -static struct validate dnfq_validate = { - VOfilsys0user1, - 3, - FILSYS_ID, - "quota.filsys_id = %d and quota.entity_id = %d", - 2, - 0, - 0, - setup_dqot, - 0, -}; - -static char *glin_fields[] = { - NAME, - NAME, "active", "public", "hidden", "maillist", "grouplist", "gid", - ACE_TYPE, ACE_NAME, DESC, MOD1, MOD2, MOD3, -}; - -static struct validate glin_validate = { - 0, - 0, - 0, - 0, - 0, - 0, - access_vis_list_by_name, - 0, - get_list_info, -}; - -static char *alis_fields[] = { - NAME, "active", "public", "hidden", "maillist", "grouplist", "gid", - ACE_TYPE, ACE_NAME, DESC, -}; - -static struct valobj alis_valobj[] = { - {V_LOCK, 0, LIST, 0, LIST_ID, MR_DEADLOCK}, - {V_CHAR, 0}, - {V_TYPE, 7, ACE_TYPE, 0, 0, MR_ACE}, - {V_TYPEDATA, 8, 0, 0, LIST_ID, MR_ACE}, -}; - -static struct validate alis_validate = { - alis_valobj, - 4, - NAME, - "list.name = '%s'", - 1, - LIST_ID, - 0, - setup_alis, - set_modtime, -}; - -static char *ulis_fields[] = { - NAME, - "newname", "active", "public", "hidden", "maillist", "grouplist", "gid", - ACE_TYPE, ACE_NAME, DESC, -}; - -static struct valobj ulis_valobj[] = { - {V_LOCK, 0, LIST, 0, LIST_ID, MR_DEADLOCK}, - {V_ID, 0, LIST, NAME, LIST_ID, MR_LIST}, - {V_RENAME, 1, LIST, NAME, LIST_ID, MR_NOT_UNIQUE}, - {V_TYPE, 8, ACE_TYPE, 0, 0, MR_ACE}, - {V_TYPEDATA, 9, 0, 0, LIST_ID, MR_ACE}, -}; - -static struct validate ulis_validate = { - ulis_valobj, - 5, - NAME, - "list.list_id = %d", - 1, - LIST_ID, - access_list, - setup_alis, - set_modtime_by_id, -}; - -static char *dlis_fields[] = { - NAME, -}; - -static struct validate dlis_validate = { - VOlist0, - 1, - NAME, - "list.list_id = %d", - 1, - 0, - access_list, - setup_dlis, - 0, -}; - -static char *amtl_fields[] = { - "list_name", "member_type", "member_name", -}; - -static struct valobj amtl_valobj[] = { - {V_LOCK, 0, LIST, 0, LIST_ID, MR_DEADLOCK}, - {V_ID, 0, LIST, NAME, LIST_ID, MR_LIST}, - {V_TYPE, 1, "member", 0, 0, MR_TYPE}, - {V_TYPEDATA, 2, 0, 0, 0, MR_NO_MATCH}, -}; - -static struct validate amtl_validate = -{ - amtl_valobj, - 4, - 0, - 0, - 0, - 0, - access_list, - 0, - add_member_to_list, -}; - -static struct validate dmfl_validate = -{ - amtl_valobj, - 4, - 0, - 0, - 0, - 0, - access_list, - 0, - delete_member_from_list, -}; - -static char *gaus_fields[] = { - ACE_TYPE, ACE_NAME, - "use_type", "use_name", -}; - -static struct valobj gaus_valobj[] = { - {V_TYPE, 0, "gaus", 0, 0, MR_TYPE}, - {V_TYPEDATA, 1, 0, 0, 0, MR_NO_MATCH}, -}; - -static struct validate gaus_validate = { - gaus_valobj, - 2, - 0, - 0, - 0, - 0, - access_member, - 0, - get_ace_use, -}; - -static char *qgli_fields[] = { - "active", "public", "hidden", "maillist", "grouplist", - "list", -}; - -static struct valobj qgli_valobj[] = { - {V_TYPE, 0, "boolean", 0, 0, MR_TYPE}, - {V_TYPE, 1, "boolean", 0, 0, MR_TYPE}, - {V_TYPE, 2, "boolean", 0, 0, MR_TYPE}, - {V_TYPE, 3, "boolean", 0, 0, MR_TYPE}, - {V_TYPE, 4, "boolean", 0, 0, MR_TYPE}, -}; - -static struct validate qgli_validate = { - qgli_valobj, - 5, - 0, - 0, - 0, - 0, - access_qgli, - 0, - qualified_get_lists, -}; - -static char *gmol_fields[] = { - "list_name", - "member_type", "member_name", -}; - -static struct validate gmol_validate = { - VOlist0, - 1, - 0, - 0, - 0, - 0, - access_visible_list, - 0, - get_members_of_list, +static struct valobj gnqp_valobj[] = { + {V_ID, 0, MACHINE_TABLE, NAME, MACH_ID, MR_MACHINE}, + {V_WILD, 1}, }; -static char *glom_fields[] = { - "member_type", "member_name", - "list_name", "active", "public", "hidden", "maillist", "grouplist", -}; +static struct validate gnqp_validate = { gnqp_valobj, 2, }; -static struct valobj glom_valobj[] = { - {V_TYPE, 0, "rmember", 0, 0, MR_TYPE}, - {V_TYPEDATA, 1, 0, 0, 0, MR_NO_MATCH}, - {V_SORT, 0}, +static char *anfq_fields[] = { + FILESYS, LOGIN, QUOTA, }; -static struct validate glom_validate = { - glom_valobj, - 3, - 0, - 0, - 0, - 0, - access_member, - 0, - get_lists_of_member, +static struct valobj anfq_valobj[] = { + {V_LOCK, 0, FILESYS_TABLE, 0, FILSYS_ID, MR_DEADLOCK}, + {V_ID, 0, FILESYS_TABLE, LABEL, FILSYS_ID, MR_FILESYS}, + {V_ID, 1, USERS_TABLE, LOGIN, USERS_ID, MR_USER}, + {V_NUM, 2}, }; -static char *cmol_fields[] = { - "list_name", - "count", +static struct validate anfq_validate = { + anfq_valobj, + 4, + FILSYS_ID, + "filsys_id = %d AND type = 'USER' AND entity_id = %d", + 2, + 0, /* object ? */ + 0, + prefetch_filesys, + followup_aqot, }; -static struct validate cmol_validate = { - VOlist0, - 1, - 0, +static struct validate unfq_validate = { + anfq_valobj, + 4, + FILSYS_ID, + "filsys_id = %d AND type = 'USER' AND entity_id = %d", + 2, 0, 0, + setup_dqot, + followup_aqot, +}; + +static struct validate dnfq_validate = { + anfq_valobj, + 3, + FILSYS_ID, + "filsys_id = %d AND entity_id = %d", + 2, 0, - access_visible_list, 0, - count_members_of_list, + setup_dqot, + followup_dqot, }; 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 valobj gzcl_valobj[] = { + {V_RLOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_RLOCK, 0, LIST_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_RLOCK, 0, ZEPHYR_TABLE, 0, ZEPH_ID, MR_DEADLOCK}, + {V_WILD, 0}, +}; static struct validate gzcl_validate = { - VOsort0, - 1, + gzcl_valobj, + 4, 0, 0, 0, @@ -1655,27 +2392,30 @@ 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[] = { - {V_CHAR, 0}, - {V_TYPE, 1, ACE_TYPE, 0, 0, MR_ACE}, + {V_RLOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_RLOCK, 0, LIST_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_LOCK, 0, ZEPHYR_TABLE, 0, ZEPH_ID, MR_DEADLOCK}, + {V_CHAR, 0, ZEPHYR_TABLE, CLASS}, + {V_TYPE, 1, 0, ACE_TYPE, 0, MR_ACE}, {V_TYPEDATA, 2, 0, 0, LIST_ID, MR_ACE}, - {V_TYPE, 3, ACE_TYPE, 0, 0, MR_ACE}, + {V_TYPE, 3, 0, ACE_TYPE, 0, MR_ACE}, {V_TYPEDATA, 4, 0, 0, LIST_ID, MR_ACE}, - {V_TYPE, 5, ACE_TYPE, 0, 0, MR_ACE}, + {V_TYPE, 5, 0, ACE_TYPE, 0, MR_ACE}, {V_TYPEDATA, 6, 0, 0, LIST_ID, MR_ACE}, - {V_TYPE, 7, ACE_TYPE, 0, 0, MR_ACE}, + {V_TYPE, 7, 0, ACE_TYPE, 0, MR_ACE}, {V_TYPEDATA, 8, 0, 0, LIST_ID, MR_ACE}, }; static struct validate azcl_validate = { azcl_valobj, - 9, + 12, CLASS, - "zephyr.class = '%s'", + "class = '%s'", 1, 0, 0, @@ -1684,27 +2424,30 @@ 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[] = { - {V_RENAME, 1, "zephyr", CLASS, 0, MR_NOT_UNIQUE}, - {V_TYPE, 2, ACE_TYPE, 0, 0, MR_ACE}, + {V_RLOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_RLOCK, 0, LIST_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_LOCK, 0, ZEPHYR_TABLE, 0, ZEPH_ID, MR_DEADLOCK}, + {V_RENAME, 1, ZEPHYR_TABLE, CLASS, 0, MR_NOT_UNIQUE}, + {V_TYPE, 2, 0, ACE_TYPE, 0, MR_ACE}, {V_TYPEDATA, 3, 0, 0, LIST_ID, MR_ACE}, - {V_TYPE, 4, ACE_TYPE, 0, 0, MR_ACE}, + {V_TYPE, 4, 0, ACE_TYPE, 0, MR_ACE}, {V_TYPEDATA, 5, 0, 0, LIST_ID, MR_ACE}, - {V_TYPE, 6, ACE_TYPE, 0, 0, MR_ACE}, + {V_TYPE, 6, 0, ACE_TYPE, 0, MR_ACE}, {V_TYPEDATA, 7, 0, 0, LIST_ID, MR_ACE}, - {V_TYPE, 8, ACE_TYPE, 0, 0, MR_ACE}, + {V_TYPE, 8, 0, ACE_TYPE, 0, MR_ACE}, {V_TYPEDATA, 9, 0, 0, LIST_ID, MR_ACE}, }; static struct validate uzcl_validate = { uzcl_valobj, - 9, + 12, CLASS, - "zephyr.class = '%s'", + "class = '%s'", 1, 0, 0, @@ -1716,28 +2459,78 @@ static struct validate dzcl_validate = { 0, 0, CLASS, - "zephyr.class = '%s'", + "class = '%s'", + 1, + 0, + 0, + 0, + 0, +}; + +static char *gsha_fields[] = { + MACHINE, + MACHINE, ACE_TYPE, ACE_NAME, MOD1, MOD2, MOD3, +}; + +static struct validate gsha_validate = +{ + VOupwild0, 1, 0, 0, 0, 0, + 0, + 0, + followup_gsha, +}; + +static char *asha_fields[] = { + MACHINE, ACE_TYPE, ACE_NAME, +}; + +static struct valobj asha_valobj[] = { + {V_RLOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_ID, 0, MACHINE_TABLE, NAME, MACH_ID, MR_MACHINE}, + {V_RLOCK, 0, LIST_TABLE, 0, LIST_ID, MR_DEADLOCK}, + {V_TYPE, 1, 0, ACE_TYPE, 0, MR_ACE}, + {V_TYPEDATA, 2, 0, 0, 0, MR_ACE}, +}; + +static struct validate asha_validate = +{ + asha_valobj, + 5, + MACH_ID, + "mach_id = %d", + 1, + MACH_ID, + 0, + 0, + set_modtime_by_id, }; 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 valobj asvc_valobj[] = { + {V_CHAR, 0, SERVICES_TABLE, NAME}, + {V_CHAR, 1, SERVICES_TABLE, "protocol"}, + {V_NUM, 2}, + {V_CHAR, 3, SERVICES_TABLE, DESC}, }; static struct validate asvc_validate = { - VOchar0, - 1, + asvc_valobj, + 4, NAME, - "services.name = '%s'", + "name = '%s'", 1, 0, 0, @@ -1746,15 +2539,22 @@ 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 valobj gpce_valobj[]={ + {V_RLOCK, 0, USERS_TABLE, 0, USERS_ID, MR_DEADLOCK}, + {V_RLOCK, 0, MACHINE_TABLE, 0, MACH_ID, MR_DEADLOCK}, + {V_RLOCK, 0, PRINTCAP_TABLE, 0, MACH_ID, MR_DEADLOCK}, + {V_WILD, 0}, }; static struct validate gpce_validate = { - VOsort0, - 1, + gpce_valobj, + 4, 0, 0, 0, @@ -1765,22 +2565,27 @@ 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, PRINTCAP_TABLE, NAME}, + {V_ID, 1, MACHINE_TABLE, NAME, MACH_ID, MR_MACHINE}, + {V_LEN, 2, PRINTCAP_TABLE, "dir"}, + {V_LEN, 3, PRINTCAP_TABLE, "rp"}, + {V_ID, 4, MACHINE_TABLE, NAME, MACH_ID, MR_MACHINE}, + {V_NUM, 5}, + {V_NUM, 6}, + {V_CHAR, 7, PRINTCAP_TABLE, "comments"}, }; static struct validate apce_validate = { apce_valobj, - 3, + 8, NAME, - "printcap.name = '%s'", + "name = '%s'", 1, 0, 0, @@ -1792,7 +2597,7 @@ static struct validate dpce_validate = { 0, 0, NAME, - "printcap.name = '%s'", + "name = '%s'", 1, 0, 0, @@ -1801,30 +2606,31 @@ 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, PALLADIUM_TABLE, NAME}, + {V_NUM, 1}, + {V_ID, 2, MACHINE_TABLE, NAME, MACH_ID, MR_MACHINE}, }; static struct validate apdm_validate = { apdm_valobj, - 2, + 3, NAME, - "palladium.name = '%s'", + "name = '%s'", 1, 0, 0, @@ -1836,7 +2642,7 @@ static struct validate dpdm_validate = { 0, 0, NAME, - "palladium.name = '%s'", + "name = '%s'", 1, 0, 0, @@ -1854,16 +2660,16 @@ static char *aali_fields[] = { }; static struct valobj aali_valobj[] = { - {V_CHAR, 0}, - {V_TYPE, 1, "alias", 0, 0, MR_TYPE}, - {V_CHAR, 2}, + {V_CHAR, 0, ALIAS_TABLE, NAME}, + {V_TYPE, 1, 0, ALIAS, 0, MR_TYPE}, + {V_CHAR, 2, ALIAS_TABLE, "trans"}, }; static struct validate aali_validate = { aali_valobj, 3, "trans", - "alias.name = '%s' and alias.type = '%s' and alias.trans = '%s'", + "name = '%s' and type = '%s' and trans = '%s'", 3, 0, 0, @@ -1876,7 +2682,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, @@ -1889,7 +2695,7 @@ static char *gval_fields[] = { }; static struct valobj gval_valobj[] = { - {V_NAME, 0, "numvalues", NAME, 0, MR_NO_MATCH}, + {V_NAME, 0, NUMVALUES_TABLE, NAME, 0, MR_NO_MATCH}, }; static struct validate gval_validate = { @@ -1908,12 +2714,17 @@ static char *aval_fields[] = { NAME, "value", }; +static struct valobj aval_valobj[] = { + {V_CHAR, 0, NUMVALUES_TABLE, NAME}, + {V_NUM, 1}, +}; + static struct validate aval_validate = /* for aval, uval, and dval */ { - VOchar0, - 1, + aval_valobj, + 2, NAME, - "numvalues.name = '%s'", + "name = '%s'", 1, 0, 0, @@ -1926,13 +2737,38 @@ static char *dval_fields[] = { }; static char *gats_fields[] = { - "table_name", "retrieves", "appends", "updates", "deletes", MOD1, MOD2, MOD3, + "table_name", "appends", "updates", "deletes", MOD1, MOD2, MOD3, +}; + +static char *_sdl_fields[] = { + "level", +}; + +static struct valobj _sdl_valobj[] = { + {V_NUM, 0}, +}; + +static struct validate _sdl_validate = +{ + _sdl_valobj, + 1, + (char *)0, + (char *)0, + 0, + 0, + 0, + 0, + _sdl_followup, }; /* 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 */ @@ -1940,120 +2776,240 @@ struct query Queries2[] = { "galo", RETRIEVE, "u", - USERS, - "login, text(uid), shell, last, first, middle FROM users", + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.last, u.first, u.middle FROM users u", galo_fields, 6, - "users_id != 0", + "u.users_id != 0", 0, + "u.login", 0, }, - + { /* Q_GAAL - GET_ALL_ACTIVE_LOGINS */ "get_all_active_logins", "gaal", RETRIEVE, "u", - USERS, - "login, text(uid), shell, last, first, middle FROM users", + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.last, u.first, u.middle FROM users u", galo_fields, 6, - "status = 1", + "u.status = 1", 0, + "u.login", 0, }, - + + { + /* Q_GUAL - GET_USER_ACCOUNT_BY_LOGIN */ + "get_user_account_by_login", + "gual", + RETRIEVE, + "u", + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.last, u.first, u.middle, u.status, u.clearid, u.type, str.string, u.signature, u.secure, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith FROM users u, strings str", + gual_fields, + 15, + "u.login LIKE '%s' ESCAPE '*' AND u.users_id != 0 AND u.comments = str.string_id", + 1, + "u.login", + &gubl_validate, + }, + + { + /* Q_GUAU - GET_USER_ACCOUNT_BY_UID */ + "get_user_account_by_uid", + "guau", + RETRIEVE, + "u", + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.last, u.first, u.middle, u.status, u.clearid, u.type, str.string, u.signature, u.secure, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith FROM users u, strings str", + guau_fields, + 15, + "u.unix_uid = %s AND u.users_id != 0 AND u.comments = str.string_id", + 1, + "u.login", + &gubu_validate, + }, + + { + /* Q_GUAN - GET_USER_ACCOUNT_BY_NAME */ + "get_user_account_by_name", + "guan", + RETRIEVE, + "u", + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.last, u.first, u.middle, u.status, u.clearid, u.type, str.string, u.signature, u.secure, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), 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.comments = str.string_id", + 2, + "u.last, u.first", + &guan_validate, + }, + + { + /* Q_GUAC - GET_USER_ACCOUNT_BY_CLASS */ + "get_user_account_by_class", + "guac", + RETRIEVE, + "u", + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.last, u.first, u.middle, u.status, u.clearid, u.type, str.string, u.signature, u.secure, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith FROM users u, strings str", + guac_fields, + 15, + "u.type = UPPER('%s') AND u.users_id != 0 AND u.comments = str.string_id", + 1, + "u.login", + &VDfixmodby, + }, + + { + /* Q_GUAM - GET_USER_ACCOUNT_BY_MITID */ + "get_user_account_by_id", + "guai", + RETRIEVE, + "u", + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.last, u.first, u.middle, u.status, u.clearid, u.type, str.string, u.signature, u.secure, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith FROM users u, strings str", + guam_fields, + 15, + "u.clearid LIKE '%s' ESCAPE '*' AND u.users_id != 0 AND u.comments = str.string_id", + 1, + "u.login", + &VDwildfixmodby, + }, + { /* Q_GUBL - GET_USER_BY_LOGIN */ "get_user_by_login", "gubl", RETRIEVE, "u", - USERS, - "login, text(uid), shell, last, first, middle, text(status), clearid, type, modtime, text(modby), modwith FROM users", + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.last, u.first, u.middle, u.status, u.clearid, u.type, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith FROM users u", gubl_fields, 12, - "login = '%s' AND users_id != 0", + "u.login LIKE '%s' ESCAPE '*' AND u.users_id != 0", 1, - &gubx_validate, + "u.login", + &gubl_validate, }, - + { /* Q_GUBU - GET_USER_BY_UID */ "get_user_by_uid", "gubu", RETRIEVE, "u", - USERS, - "login, text(uid), shell, last, first, middle, text(status), clearid, type, modtime, text(modby), modwith FROM users", + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.last, u.first, u.middle, u.status, u.clearid, u.type, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith FROM users u", gubu_fields, 12, - "uid = %s AND users_id != 0", + "u.unix_uid = %s AND u.users_id != 0", 1, - &gubx_validate, + "u.login", + &gubu_validate, }, - + { /* Q_GUBN - GET_USER_BY_NAME */ "get_user_by_name", "gubn", RETRIEVE, "u", - USERS, - "login, text(uid), shell, last, first, middle, text(status), clearid, type, modtime, text(modby), modwith FROM users", + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.last, u.first, u.middle, u.status, u.clearid, u.type, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith FROM users u", gubn_fields, 12, - "first = '%s' AND last = '%s' AND users_id != 0", + "u.first LIKE '%s' ESCAPE '*' AND u.last LIKE '%s' ESCAPE '*' AND u.users_id != 0", 2, - &VDsortf, + "u.last, u.first", + &gubn_validate, }, - + { /* Q_GUBC - GET_USER_BY_CLASS */ "get_user_by_class", "gubc", RETRIEVE, "u", - USERS, - "login, text(uid), shell, last, first, middle, text(status), clearid, type, modtime, text(modby), modwith FROM users", + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.last, u.first, u.middle, u.status, u.clearid, u.type, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith FROM users u", gubc_fields, 12, - "type = uppercase('%s') AND users_id != 0", + "u.type = UPPER('%s') AND u.users_id != 0", 1, - &VDsortf, + "u.login", + &VDfixmodby, }, - + { /* Q_GUBM - GET_USER_BY_MITID */ "get_user_by_mitid", "gubm", RETRIEVE, "u", - USERS, - "login, text(uid), shell, last, first, middle, text(status), clearid, type, modtime, text(modby), modwith FROM users", + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.last, u.first, u.middle, u.status, u.clearid, u.type, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith FROM users u", gubm_fields, 12, - "clearid = '%s' AND users_id != 0", + "u.clearid LIKE '%s' ESCAPE '*' AND u.users_id != 0", + 1, + "u.login", + &VDwildfixmodby, + }, + + { + /* Q_GUDF - GET_USER_DIRECTORY_FLAGS */ + "get_user_directory_flags", + "gudf", + RETRIEVE, + "u", + USERS_TABLE, + "u.dirsuppress, u.dirremote FROM users u", + gudf_fields, + 2, + "u.users_id = %d", 1, - &VDsortf, + 0, + &gudf_validate, }, { - /* Q_AUSR - ADD_USER */ /** Needs subselect */ + /* Q_AUAC - ADD_USER_ACCOUNT */ /* uses prefetch_value() for users_id */ + "add_user_account", + "auac", + APPEND, + "u", + USERS_TABLE, + "INTO users (login, unix_uid, shell, last, first, middle, status, clearid, type, comments, signature, secure, users_id) VALUES ('%s', %s, '%s', NVL('%s',CHR(0)), NVL('%s',CHR(0)), NVL('%s',CHR(0)), %s, NVL('%s',CHR(0)), '%s', %d, LENGTH(NVL('%s',CHR(0))), %s, %s)", /* followup_ausr fixes signature field */ + auac_fields, + 12, + (char *)0, + 0, + 0, + &auac_validate, + }, + + { + /* Q_AUSR - ADD_USER */ /* uses prefetch_value() for users_id */ "add_user", "ausr", APPEND, "u", - USERS, - "INTO users (login, users_id, uid, shell, last, first, middle, status, clearid, type) VALUES ( '%s', numvalues.value, %s, '%s', '%s', '%s', '%s', %s, '%s', '%s')", - ausr_fields, + USERS_TABLE, + "INTO users (login, unix_uid, shell, last, first, middle, status, clearid, type, comments, signature, secure, users_id) VALUES ('%s', %s, '%s', NVL('%s',CHR(0)), NVL('%s',CHR(0)), NVL('%s',CHR(0)), %s, NVL('%s',CHR(0)), '%s', 0, CHR(0), 0, %s)", + auac_fields, 9, - "numvalues.name = 'users_id'", + 0, + 0, 0, &ausr_validate, }, - + { /* Q_RUSR - REGISTER_USER */ "register_user", @@ -2066,21 +3022,39 @@ struct query Queries2[] = { 3, 0, 0, + 0, &rusr_validate, }, - + + { + /* Q_UUAC - UPDATE_USER_ACCOUNT */ + "update_user_account", + "uuac", + UPDATE, + "u", + USERS_TABLE, + "users SET login = '%s', unix_uid = %s, shell = '%s', last = NVL('%s',CHR(0)), first = NVL('%s',CHR(0)), middle = NVL('%s',CHR(0)), status = %s, clearid = NVL('%s',CHR(0)), type = '%s', comments = %d, signature = LENGTH(NVL('%s',CHR(0))), secure = %s", /* followup_uuac fixes signature */ + uuac_fields, + 12, + "users_id = %d", + 1, + 0, + &uuac_validate, + }, + { /* Q_UUSR - UPDATE_USER */ "update_user", "uusr", UPDATE, "u", - USERS, - "users SET login = '%s', uid = %s, shell = '%s', last = '%s', first = '%s', middle = '%s', status = %s, clearid = '%s', type = '%s'", - uusr_fields, + USERS_TABLE, + "users SET login = '%s', unix_uid = %s, shell = '%s', last = NVL('%s',CHR(0)), first = NVL('%s',CHR(0)), middle = NVL('%s',CHR(0)), status = %s, clearid = NVL('%s',CHR(0)), type = '%s'", + uuac_fields, 9, "users_id = %d", 1, + 0, &uusr_validate, }, @@ -2090,12 +3064,13 @@ struct query Queries2[] = { "uush", UPDATE, "u", - USERS, + USERS_TABLE, "users SET shell = '%s'", uush_fields, 1, "users_id = %d", 1, + 0, &uush_validate, }, @@ -2105,14 +3080,47 @@ struct query Queries2[] = { "uust", UPDATE, "u", - USERS, + USERS_TABLE, "users SET status = %s", uust_fields, 1, "users_id = %d", 1, + 0, + &uust_validate, + }, + + { + /* Q_UUSS - UPDATE_USER_SECURITY_STATUS */ + "update_user_security_status", + "uuss", + UPDATE, + "u", + USERS_TABLE, + "users SET secure = %s", + uuss_fields, + 1, + "users_id = %d", + 1, + 0, &uust_validate, }, + + { + /* Q_UUDF - UPDATE_USER_DIRECTORY_FLAGS */ + "update_user_directory_flags", + "uudf", + UPDATE, + "u", + USERS_TABLE, + "users SET dirsuppress = %s, dirremote = %s", + uudf_fields, + 2, + "users_id = %d", + 1, + 0, + &uudf_validate, + }, { /* Q_DUSR - DELETE_USER */ @@ -2120,12 +3128,13 @@ struct query Queries2[] = { "dusr", DELETE, "u", - USERS, + USERS_TABLE, (char *)0, dusr_fields, 0, "users_id = %d", 1, + 0, &dusr_validate, }, @@ -2135,12 +3144,13 @@ struct query Queries2[] = { "dubu", DELETE, "u", - USERS, + USERS_TABLE, (char *)0, dubu_fields, 0, - "u.users_id = %d", + "users_id = %d", 1, + 0, &dubu_validate, }, @@ -2150,13 +3160,14 @@ struct query Queries2[] = { "gkum", RETRIEVE, "k", - "krbmap", - "u.login, s.string FROM krbmap k, users u, strings s", + KRBMAP_TABLE, + "u.login, str.string FROM krbmap km, users u, strings str", 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 str.string LIKE '%s' ESCAPE '*' AND km.users_id = u.users_id AND km.string_id = str.string_id", 2, - &VDsort2, + "u.login", + &VDwild2, }, { @@ -2165,12 +3176,13 @@ struct query Queries2[] = { "akum", APPEND, "k", - "krbmap", - "INTO krbmap (users_id, string_id) VALUES (%s, %s)", + KRBMAP_TABLE, + "INTO krbmap (users_id, string_id) VALUES (%d, %d)", akum_fields, 2, 0, 0, + 0, &akum_validate, }, @@ -2180,12 +3192,13 @@ struct query Queries2[] = { "dkum", DELETE, "k", - "krbmap", + KRBMAP_TABLE, 0, akum_fields, 0, - "k.users_id = %d AND k.string_id = %d", + "users_id = %d AND string_id = %d", 2, + 0, &dkum_validate, }, @@ -2195,12 +3208,13 @@ struct query Queries2[] = { "gfbl", RETRIEVE, "u", - USERS, - "login, fullname, nickname, home_addr, home_phone, office_addr, office_phone, department, affiliation, fmodtime, text(fmodby), fmodwith FROM users", + USERS_TABLE, + "login, fullname, nickname, home_addr, home_phone, office_addr, office_phone, department, affiliation, TO_CHAR(fmodtime, 'DD-mon-YYYY HH24:MI:SS'), fmodby, fmodwith FROM users", gfbl_fields, 12, "users_id = %d", 1, + 0, &gfbl_validate, }, @@ -2210,12 +3224,13 @@ struct query Queries2[] = { "ufbl", UPDATE, "u", - USERS, - "users SET fullname= '%s',nickname= '%s',home_addr= '%s',home_phone= '%s',office_addr= '%s',office_phone= '%s',department= '%s',affiliation= '%s'", + USERS_TABLE, + "users SET fullname= NVL('%s',CHR(0)),nickname= NVL('%s',CHR(0)),home_addr= NVL('%s',CHR(0)),home_phone= NVL('%s',CHR(0)),office_addr= NVL('%s',CHR(0)),office_phone= NVL('%s',CHR(0)),department= NVL('%s',CHR(0)),affiliation= NVL('%s',CHR(0))", ufbl_fields, 8, "users_id = %d", 1, + 0, &ufbl_validate, }, @@ -2225,12 +3240,13 @@ struct query Queries2[] = { "gpob", RETRIEVE, "u", - USERS, - "login, potype, text(pop_id) + ':' + text(box_id), pmodtime, text(pmodby), pmodwith FROM users", + USERS_TABLE, + "login, potype, pop_id || ':' || box_id, TO_CHAR(pmodtime, 'DD-mon-YYYY HH24:MI:SS'), pmodby, pmodwith FROM users", gpob_fields, 6, "users_id = %d", 1, + 0, &gpob_validate, }, @@ -2240,12 +3256,13 @@ struct query Queries2[] = { "gapo", RETRIEVE, "u", - USERS, - "login, potype, text(pop_id) + ':' + text(box_id) FROM users", + USERS_TABLE, + "login, potype, pop_id || ':' || box_id FROM users", gpox_fields, 3, "potype != 'NONE'", 0, + "u.login", &gpox_validate, }, @@ -2255,12 +3272,13 @@ struct query Queries2[] = { "gpop", RETRIEVE, "u", - USERS, - "login, potype, text(pop_id) + ':' + text(box_id) FROM users", + USERS_TABLE, + "login, potype, pop_id || ':' || box_id FROM users", gpox_fields, 3, "potype = 'POP'", 0, + "u.login", &gpox_validate }, @@ -2270,12 +3288,13 @@ struct query Queries2[] = { "gpos", RETRIEVE, "u", - USERS, - "login, potype, text(pop_id) + ':' + text(box_id) FROM users", + USERS_TABLE, + "login, potype, pop_id || ':' || box_id FROM users", gpox_fields, 3, "potype = 'SMTP'", 0, + "u.login", &gpox_validate }, @@ -2285,12 +3304,13 @@ struct query Queries2[] = { "spob", UPDATE, 0, - USERS, + USERS_TABLE, 0, spob_fields, 3, (char *)0, 0, + 0, &spob_validate, }, @@ -2300,28 +3320,94 @@ struct query Queries2[] = { "spop", UPDATE, "u", - USERS, + USERS_TABLE, "users SET potype = 'POP'", spob_fields, 0, - "users_id = %d", - 1, - &spop_validate, + "users_id = %d", + 1, + 0, + &spop_validate, + }, + + { + /* Q_DPOB - DELETE_POBOX */ + "delete_pobox", + "dpob", + UPDATE, + "u", + USERS_TABLE, + "users SET potype = 'NONE'", + spob_fields, + 0, + "users_id = %d", + 1, + 0, + &dpob_validate, + }, + + { + /* Q_GHST - GET_HOST */ + "get_host", + "ghst", + RETRIEVE, + "m", + MACHINE_TABLE, + "m.name, m.vendor, m.model, m.os, m.location, m.contact, m.use, m.status, TO_CHAR(m.statuschange, 'DD-mon-YYYY HH24:MI:SS'), s.name, m.address, m.owner_type, m.owner_id, m.acomment, m.ocomment, TO_CHAR(m.created, 'DD-mon-YYYY HH24:MI:SS'), m.creator, TO_CHAR(m.inuse, 'DD-mon-YYYY HH24:MI:SS'), TO_CHAR(m.modtime, 'DD-mon-YYYY HH24:MI:SS'), 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 s.name LIKE '%s' ESCAPE '*' AND m.mach_id != 0 AND s.snet_id = m.snet_id", + 4, + "m.name", + &ghst_validate, + }, + + { + /* Q_AHST - ADD_HOST */ /* uses prefetch_value() for mach_id */ + "add_host", + "ahst", + APPEND, + "m", + MACHINE_TABLE, + "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 (UPPER('%s'),NVL(UPPER('%s'),CHR(0)),NVL(UPPER('%s'),CHR(0)),NVL(UPPER('%s'),CHR(0)),NVL(UPPER('%s'),CHR(0)),NVL('%s',CHR(0)),%s,%s,SYSDATE,%d,'%s','%s',%d,%d,%d,SYSDATE,SYSDATE,%s,%s)", + ahst_fields, + 14, + 0, + 0, + 0, + &ahst_validate, }, { - /* Q_DPOB - DELETE_POBOX */ - "delete_pobox", - "dpob", + /* Q_UHST - UPDATE_HOST */ + "update_host", + "uhst", UPDATE, - "u", - USERS, - "users SET potype = 'NONE'", - spob_fields, + "m", + MACHINE_TABLE, + "machine SET name=NVL(UPPER('%s'),CHR(0)),vendor=NVL(UPPER('%s'),CHR(0)),model=NVL(UPPER('%s'),CHR(0)),os=NVL(UPPER('%s'),CHR(0)),location=NVL(UPPER('%s'),CHR(0)),contact=NVL('%s',CHR(0)),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, 0, - "users_id = %d", + &uhst_validate, + }, + + { + /* Q_DHST - DELETE_HOST */ + "delete_host", + "dhst", + DELETE, + "m", + MACHINE_TABLE, + (char *)0, + dhst_fields, + 0, + "mach_id = %d", 1, - &dpob_validate, + 0, + &dhst_validate, }, { @@ -2330,58 +3416,126 @@ struct query Queries2[] = { "gmac", RETRIEVE, "m", - MACHINE, - "name, type, modtime, text(modby), modwith FROM machine", + MACHINE_TABLE, + "name, vendor, TO_CHAR(modtime, 'DD-mon-YYYY HH24:MI:SS'), modby, modwith FROM machine", gmac_fields, 5, - "name = uppercase('%s') AND mach_id != 0", + "name LIKE '%s' ESCAPE '*' AND mach_id != 0", 1, - &VDsortf, + "m.name", + &VDupwildfixmodby, + }, + + { + /* Q_GHAL - GET_HOSTALIAS */ + "get_hostalias", + "ghal", + RETRIEVE, + "a", + HOSTALIAS_TABLE, + "a.name, 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, + "m.name, a.name", + &ghal_validate, }, { - /* Q_AMAC - ADD_MACHINE */ /** Needs subselect */ - "add_machine", - "amac", + /* Q_AHAL - ADD_HOSTALIAS */ + "add_hostalias", + "ahal", APPEND, - "m", - MACHINE, - "INTO machine (name, mach_id, type) VALUES (uppercase('%s'),numvalues.value,'%s')", - amac_fields, + "a", + HOSTALIAS_TABLE, + "INTO hostalias (name, mach_id) VALUES (UPPER('%s'),%d)", + ghal_fields, 2, - "numvalues.name = 'mach_id'", 0, - &amac_validate, + 0, + 0, + &ahal_validate, }, { - /* Q_UMAC - UPDATE_MACHINE */ - "update_machine", - "umac", - UPDATE, - "m", - MACHINE, - "machine SET name = uppercase('%s'), type = '%s'", - umac_fields, + /* Q_DHAL - DELETE_HOSTALIAS */ + "delete_hostalias", + "dhal", + DELETE, + "a", + HOSTALIAS_TABLE, + (char *)0, + ghal_fields, + 0, + "name = UPPER('%s') AND mach_id = %d", 2, - "mach_id = %d", + 0, + &dhal_validate, + }, + + { + /* Q_GSNT - GET_SUBNET */ + "get_subnet", + "gsnt", + RETRIEVE, + "s", + SUBNET_TABLE, + "name, description, saddr, mask, low, high, prefix, owner_type, owner_id, TO_CHAR(modtime, 'DD-mon-YYYY HH24:MI:SS'), modby, modwith FROM subnet", + gsnt_fields, + 12, + "name LIKE '%s' ESCAPE '*' and snet_id != 0", + 1, + "name", + &gsnt_validate, + }, + + { + /* Q_ASNT - ADD_SUBNET */ + "add_subnet", + "asnt", + APPEND, + "s", + SUBNET_TABLE, + "INTO subnet (name, description, saddr, mask, low, high, prefix, owner_type, owner_id, snet_id) VALUES (UPPER('%s'), NVL('%s',CHR(0)), %s, %s, %s, %s, NVL('%s',CHR(0)), '%s', %d, %s)", + asnt_fields, + 9, + 0, + 0, + 0, + &asnt_validate, + }, + + { + /* Q_USNT - UPDATE_SUBNET */ + "update_subnet", + "usnt", + UPDATE, + "s", + SUBNET_TABLE, + "subnet SET name=UPPER('%s'), description=NVL('%s',CHR(0)), saddr=%s, mask=%s, low=%s, high=%s, prefix=NVL('%s',CHR(0)), owner_type='%s', owner_id=%d", + usnt_fields, + 9, + "snet_id = %d", 1, - &umac_validate, + 0, + &usnt_validate, }, { - /* Q_DMAC - DELETE_MACHINE */ - "delete_machine", - "dmac", + /* Q_DSNT - DELETE_SUBNET */ + "delete_subnet", + "dsnt", DELETE, - "m", - MACHINE, + "s", + SUBNET_TABLE, (char *)0, - dmac_fields, + dsnt_fields, 0, - "mach_id = %d", + "snet_id = %d", 1, - &dmac_validate, + 0, + &dsnt_validate, }, { @@ -2390,26 +3544,28 @@ struct query Queries2[] = { "gclu", RETRIEVE, "c", - CLUSTER, - "name, desc, location, modtime, text(modby), modwith FROM cluster", + CLUSTER_TABLE, + "name, description, location, TO_CHAR(modtime, 'DD-mon-YYYY HH24:MI:SS'), modby, modwith FROM clusters", gclu_fields, 6, - "name = '%s' AND clu_id != 0", + "name LIKE '%s' ESCAPE '*' AND clu_id != 0", 1, - &VDsortf, + "name", + &VDwildfixmodby, }, { - /* Q_ACLU - ADD_CLUSTER */ /** Needs subselect */ + /* Q_ACLU - ADD_CLUSTER */ /* uses prefetch_value() for clu_id */ "add_cluster", "aclu", APPEND, "c", - CLUSTER, - "INTO cluster (name, clu_id, desc, location) VALUES ('%s',numvalues.value,'%s','%s')", + CLUSTER_TABLE, + "INTO clusters (name, description, location, clu_id) VALUES ('%s',NVL('%s',CHR(0)),NVL('%s',CHR(0)),%s)", aclu_fields, 3, - "numvalues.name = 'clu_id'", + 0, + 0, 0, &aclu_validate, }, @@ -2420,12 +3576,13 @@ struct query Queries2[] = { "uclu", UPDATE, "c", - CLUSTER, - "cluster SET name = '%s', desc = '%s', location = '%s'", + CLUSTER_TABLE, + "clusters SET name = '%s', description = NVL('%s',CHR(0)), location = NVL('%s',CHR(0))", uclu_fields, 3, "clu_id = %d", 1, + 0, &uclu_validate, }, @@ -2435,12 +3592,13 @@ struct query Queries2[] = { "dclu", DELETE, "c", - CLUSTER, + CLUSTER_TABLE, (char *)0, dclu_fields, 0, "clu_id = %d", 1, + 0, &dclu_validate, }, @@ -2449,14 +3607,15 @@ struct query Queries2[] = { "get_machine_to_cluster_map", "gmcm", RETRIEVE, - "map", - "mcmap", - "m.name, c.name FROM machine m, cluster c, mcmap map", + "mcm", + MCMAP_TABLE, + "m.name, c.name FROM machine m, clusters c, mcmap mcm", 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 LIKE '%s' ESCAPE '*' AND c.name LIKE '%s' ESCAPE '*' AND mcm.clu_id = c.clu_id AND mcm.mach_id = m.mach_id", 2, - &VDsort2, + "m.name, c.name", + &gmcm_validate, }, { @@ -2464,13 +3623,14 @@ struct query Queries2[] = { "add_machine_to_cluster", "amtc", APPEND, - "m", - "mcmap", + "mcm", + MCMAP_TABLE, "INTO mcmap (mach_id, clu_id) VALUES (%d, %d)", gmcm_fields, 2, 0, 0, + 0, &amtc_validate, }, @@ -2479,13 +3639,14 @@ struct query Queries2[] = { "delete_machine_from_cluster", "dmfc", DELETE, - "m", - "mcmap", + "mcm", + MCMAP_TABLE, 0, gmcm_fields, 0, "mach_id = %d AND clu_id = %d", 2, + 0, &amtc_validate, }, @@ -2494,14 +3655,15 @@ struct query Queries2[] = { "get_cluster_data", "gcld", RETRIEVE, - "s", "svc", - "c.name, s.serv_label, s.serv_cluster FROM svc s, cluster c", + SVC_TABLE, + "c.name, svc.serv_label, svc.serv_cluster FROM svc svc, clusters c", gcld_fields, 3, - "c.clu_id = s.clu_id AND c.name = '%s' AND s.serv_label = '%s'", + "c.clu_id = svc.clu_id AND c.name LIKE '%s' ESCAPE '*' AND svc.serv_label LIKE '%s' ESCAPE '*'", 2, - &VDsort2, + "c.name, svc.serv_label, svc.serv_cluster", + &VDwild2, }, { @@ -2509,13 +3671,14 @@ struct query Queries2[] = { "add_cluster_data", "acld", APPEND, - "s", "svc", + SVC_TABLE, "INTO svc (clu_id, serv_label, serv_cluster) VALUES (%d,'%s','%s')", acld_fields, 3, (char *)0, 0, + 0, &acld_validate, }, @@ -2524,14 +3687,223 @@ struct query Queries2[] = { "delete_cluster_data", "dcld", DELETE, - "s", "svc", + SVC_TABLE, (char *)0, acld_fields, 0, - "clu_id = %d AND serv_label = '%s' AND serv_cluster = '%s'", - 3, - &acld_validate, + "clu_id = %d AND serv_label = '%s' AND serv_cluster = '%s'", + 3, + 0, + &dcld_validate, + }, + + { + /* Q_GLIN - GET_LIST_INFO */ + "get_list_info", + "glin", + RETRIEVE, + 0, + LIST_TABLE, + 0, + glin_fields, + 13, + 0, + 1, + 0, + &glin_validate, + }, + + { + /* Q_EXLN - EXPAND_LIST_NAMES */ + "expand_list_names", + "exln", + RETRIEVE, + "l", + LIST_TABLE, + "name FROM list", + glin_fields, + 1, + "name LIKE '%s' ESCAPE '*' AND list_id != 0", + 1, + "name", + &VDwild0, + }, + + { + /* Q_ALIS - ADD_LIST */ /* uses prefetch_value() for list_id */ + "add_list", + "alis", + APPEND, + "l", + LIST_TABLE, + "INTO list (name, active, publicflg, hidden, maillist, grouplist, gid, acl_type, acl_id, description, list_id) VALUES ('%s',%s,%s,%s,%s,%s,%s,'%s',%d,NVL('%s',CHR(0)),%s)", + alis_fields, + 10, + 0, + 0, + 0, + &alis_validate, + }, + + { + /* Q_ULIS - UPDATE_LIST */ + "update_list", + "ulis", + UPDATE, + "l", + LIST_TABLE, + "list SET name='%s', active=%s, publicflg=%s, hidden=%s, maillist=%s, grouplist=%s, gid=%s, acl_type='%s', acl_id=%d, description=NVL('%s',CHR(0))", + ulis_fields, + 10, + "list_id = %d", + 1, + 0, + &ulis_validate, + }, + + { + /* Q_DLIS - DELETE_LIST */ + "delete_list", + "dlis", + DELETE, + "l", + LIST_TABLE, + (char *)0, + dlis_fields, + 0, + "list_id = %d", + 1, + 0, + &dlis_validate, + }, + + { + /* Q_AMTL - ADD_MEMBER_TO_LIST */ + "add_member_to_list", + "amtl", + APPEND, + 0, + IMEMBERS_TABLE, + 0, + amtl_fields, + 3, + (char *)0, + 0, + 0, + &amtl_validate, + }, + + { + /* Q_DMFL - DELETE_MEMBER_FROM_LIST */ + "delete_member_from_list", + "dmfl", + DELETE, + 0, + IMEMBERS_TABLE, + (char *)0, + amtl_fields, + 0, + 0, + 3, + 0, + &dmfl_validate, + }, + + { + /* Q_GAUS - GET_ACE_USE */ + "get_ace_use", + "gaus", + RETRIEVE, + 0, + 0, + 0, + gaus_fields, + 2, + 0, + 2, + 0, + &gaus_validate, + }, + + { + /* Q_QGLI - QUALIFIED_GET_LISTS */ + "qualified_get_lists", + "qgli", + RETRIEVE, + 0, + LIST_TABLE, + 0, + qgli_fields, + 1, + 0, + 5, + 0, + &qgli_validate, + }, + + { + /* Q_GMOL - GET_MEMBERS_OF_LIST */ + "get_members_of_list", + "gmol", + RETRIEVE, + (char *)0, + IMEMBERS_TABLE, + (char *)0, + gmol_fields, + 2, + (char *)0, + 1, + 0, + &gmol_validate, + }, + + { + /* Q_GEML - GET_END_MEMBERS_OF_LIST */ + "get_end_members_of_list", + "geml", + RETRIEVE, + (char *)0, + IMEMBERS_TABLE, + (char *)0, + gmol_fields, + 0, + (char *)0, + 1, + 0, + &geml_validate, + }, + + { + /* Q_GLOM - GET_LISTS_OF_MEMBER */ + "get_lists_of_member", + "glom", + RETRIEVE, + 0, + IMEMBERS_TABLE, + 0, + glom_fields, + 6, + 0, + 2, + 0, + &glom_validate, + }, + + { + /* Q_CMOL - COUNT_MEMBERS_OF_LIST */ + "count_members_of_list", + "cmol", + RETRIEVE, + 0, + IMEMBERS_TABLE, + 0, + cmol_fields, + 1, + 0, + 1, + 0, + &cmol_validate, }, { @@ -2540,12 +3912,13 @@ struct query Queries2[] = { "gsin", RETRIEVE, "s", - "servers", - "name, text(update_int), target_file, script, text(dfgen), text(dfcheck), type, text(enable), text(inprogress), text(harderror), errmsg, acl_type, text(acl_id), modtime, text(modby), modwith FROM servers", + SERVERS_TABLE, + "name, update_int, target_file, script, dfgen, dfcheck, type, enable, inprogress, harderror, errmsg, acl_type, acl_id, TO_CHAR(modtime, 'DD-mon-YYYY HH24:MI:SS'), modby, modwith FROM servers", gsin_fields, 16, - "name = uppercase('%s')", + "name LIKE '%s' ESCAPE '*'", 1, + "name", &gsin_validate, }, @@ -2555,12 +3928,13 @@ struct query Queries2[] = { "qgsv", RETRIEVE, 0, - "servers", + SERVERS_TABLE, 0, qgsv_fields, 1, 0, 3, + 0, &qgsv_validate, }, @@ -2570,12 +3944,13 @@ struct query Queries2[] = { "asin", APPEND, "s", - "servers", - "INTO servers (name, update_int, target_file, script, type, enable, acl_type, acl_id) VALUES (uppercase('%s'),%s,'%s','%s','%s',%s,'%s',%d)", + SERVERS_TABLE, + "INTO servers (name, update_int, target_file, script, type, enable, acl_type, acl_id) VALUES (UPPER('%s'),%s,'%s','%s','%s',%s,'%s',%d)", asin_fields, 8, (char *)0, 0, + 0, &asin_validate, }, @@ -2585,12 +3960,13 @@ struct query Queries2[] = { "usin", UPDATE, "s", - "servers", + SERVERS_TABLE, "servers SET update_int = %s, target_file = '%s', script = '%s', type = '%s', enable = %s, acl_type = '%s', acl_id = %d", asin_fields, 7, - "name = uppercase('%s')", + "name = UPPER('%s')", 1, + 0, &asin_validate, }, @@ -2600,12 +3976,13 @@ struct query Queries2[] = { "rsve", UPDATE, "s", - "servers", + SERVERS_TABLE, "servers SET harderror = 0, dfcheck = dfgen", dsin_fields, 0, - "name = uppercase('%s')", + "name = UPPER('%s')", 1, + 0, &rsve_validate, }, @@ -2615,12 +3992,13 @@ struct query Queries2[] = { "ssif", UPDATE, "s", - "servers", - "servers SET dfgen = %s, dfcheck = %s, inprogress = %s, harderror = %s, errmsg = '%s'", + SERVERS_TABLE, + "servers SET dfgen = %s, dfcheck = %s, inprogress = %s, harderror = %s, errmsg = NVL('%s',CHR(0))", ssif_fields, 5, - "name = uppercase('%s')", + "name = UPPER('%s')", 1, + 0, &ssif_validate, }, @@ -2630,12 +4008,13 @@ struct query Queries2[] = { "dsin", DELETE, "s", - "servers", + SERVERS_TABLE, (char *)0, dsin_fields, 0, - "name = uppercase('%s')", + "name = UPPER('%s')", 1, + 0, &dsin_validate, }, @@ -2645,27 +4024,29 @@ struct query Queries2[] = { "gshi", RETRIEVE, "sh", - "serverhosts", - "sh.service, m.name, text(sh.enable), text(sh.override), text(sh.success), text(sh.inprogress), text(sh.hosterror), sh.hosterrmsg, text(sh.ltt), text(sh.lts), text(sh.value1), text(sh.value2), sh.value3, sh.modtime, text(sh.modby), sh.modwith FROM serverhosts sh, machine m", + SERVERHOSTS_TABLE, + "sh.service, m.name, sh.enable, sh.override, sh.success, sh.inprogress, sh.hosterror, sh.hosterrmsg, sh.ltt, sh.lts, sh.value1, sh.value2, sh.value3, TO_CHAR(sh.modtime, 'DD-mon-YYYY HH24:MI:SS'), 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", + "sh.service LIKE '%s' ESCAPE '*' AND m.name LIKE '%s' ESCAPE '*' AND m.mach_id = sh.mach_id", 2, + 0, &gshi_validate, }, { - /* Q_QGSV - QUALIFIED_GET_SERVER_HOST */ + /* Q_QGSH - QUALIFIED_GET_SERVER_HOST */ "qualified_get_server_host", "qgsh", RETRIEVE, 0, - "serverhosts", + SERVERHOSTS_TABLE, 0, qgsh_fields, 2, 0, 6, + 0, &qgsh_validate, }, @@ -2675,12 +4056,13 @@ struct query Queries2[] = { "ashi", APPEND, "sh", - "serverhosts", - "INTO serverhosts (service, mach_id, enable, value1, value2, value3) VALUES (uppercase('%s'), %d, %s, %s, %s, '%s')", + SERVERHOSTS_TABLE, + "INTO serverhosts (service, mach_id, enable, value1, value2, value3) VALUES (UPPER('%s'), %d, %s, %s, %s, NVL('%s',CHR(0)))", ashi_fields, 6, (char *)0, 0, + 0, &ashi_validate, }, @@ -2690,12 +4072,13 @@ struct query Queries2[] = { "ushi", UPDATE, "sh", - "serverhosts", - "serverhosts SET enable = %s, value1 = %s, value2 = %s, value3 = '%s'", + SERVERHOSTS_TABLE, + "serverhosts SET enable = %s, value1 = %s, value2 = %s, value3 = NVL('%s',CHR(0))", ashi_fields, 4, - "service = uppercase('%s') AND mach_id = %d", + "service = UPPER('%s') AND mach_id = %d", 2, + 0, &ashi_validate, }, @@ -2705,12 +4088,13 @@ struct query Queries2[] = { "rshe", UPDATE, "sh", - "serverhosts", + SERVERHOSTS_TABLE, "serverhosts SET hosterror = 0", dshi_fields, 0, - "service = uppercase('%s') AND mach_id = %d", + "service = UPPER('%s') AND mach_id = %d", 2, + 0, &rshe_validate, }, @@ -2720,27 +4104,29 @@ struct query Queries2[] = { "ssho", UPDATE, "sh", - "serverhosts", + SERVERHOSTS_TABLE, "serverhosts SET override = 1", dshi_fields, 0, - "service = uppercase('%s') AND mach_id = %d", + "service = UPPER('%s') AND mach_id = %d", 2, + 0, &ssho_validate, }, { - /* 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, "s", - "serverhosts", - "serverhosts SET override = %s, success = %s, inprogress = %s, hosterror = %s, hosterrmsg = '%s', ltt = %s, lts = %s", + SERVERHOSTS_TABLE, + "serverhosts SET override = %s, success = %s, inprogress = %s, hosterror = %s, hosterrmsg = NVL('%s',CHR(0)), ltt = %s, lts = %s", sshi_fields, 7, - "s.service = uppercase('%s') AND s.mach_id = machine.mach_id AND machine.name = '%s'", + "service = UPPER('%s') AND mach_id = %d", 2, + 0, &sshi_validate, }, @@ -2750,73 +4136,14 @@ struct query Queries2[] = { "dshi", DELETE, "sh", - "serverhosts", + SERVERHOSTS_TABLE, (char *)0, dshi_fields, 0, - "service = uppercase('%s') AND mach_id = %d", - 2, - &dshi_validate, - }, - - { - /* Q_GSHA - GET_SERVER_HOST_ACCESS */ - "get_server_host_access", - "gsha", - RETRIEVE, - "ha", - "hostaccess", - "m.name, ha.acl_type, text(ha.acl_id), ha.modtime, text(ha.modby), ha.modwith FROM hostaccess ha, machine m", - gsha_fields, - 6, - "m.name = uppercase('%s') AND ha.mach_id = m.mach_id", - 1, - &gsha_validate, - }, - - { - /* Q_ASHA - ADD_SERVER_HOST_ACCESS */ - "add_server_host_access", - "asha", - APPEND, - "ha", - "hostaccess", - "INTO hostaccess (mach_id, acl_type, acl_id) VALUES (%d,'%s',%d)", - asha_fields, - 3, - 0, - 0, - &asha_validate, - }, - - { - /* Q_USHA - UPDATE_SERVER_HOST_ACCESS */ - "update_server_host_access", - "usha", - UPDATE, - "ha", - "hostaccess", - "hostaccess SET acl_type = '%s', acl_id = %d", - asha_fields, + "service = UPPER('%s') AND mach_id = %d", 2, - "mach_id = %d", - 1, - &asha_validate, - }, - - { - /* Q_DSHA - DELETE_SERVER_HOST_ACCESS */ - "delete_server_host_access", - "dsha", - DELETE, - "ha", - "hostaccess", - 0, - asha_fields, 0, - "mach_id = %d", - 1, - &VDmach, + &dshi_validate, }, { @@ -2825,13 +4152,14 @@ struct query Queries2[] = { "gslo", RETRIEVE, "sh", - "serverhosts", + SERVERHOSTS_TABLE, "sh.service, m.name FROM serverhosts sh, machine m", gslo_fields, 2, - "sh.service = uppercase('%s') AND sh.mach_id = m.mach_id", + "sh.service LIKE '%s' ESCAPE '*' AND sh.mach_id = m.mach_id", 1, - 0, + "sh.service, m.name", + &VDupwild0, }, { @@ -2840,13 +4168,14 @@ struct query Queries2[] = { "gfsl", RETRIEVE, "fs", - FILESYS, - "fs.label, fs.type, m.name, fs.name, fs.mount, fs.access, fs.comments, u.login, l.name, text(fs.createflg), fs.lockertype, fs.modtime, text(fs.modby), fs.modwith FROM filesys fs, machine m, users u, list l", + FILESYS_TABLE, + "fs.label, fs.type, m.name, fs.name, fs.mount, fs.rwaccess, fs.comments, u.login, l.name, fs.createflg, fs.lockertype, TO_CHAR(fs.modtime, 'DD-mon-YYYY HH24:MI:SS'), 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, + "fs.label", + &VDwildfixmodby, }, { @@ -2855,12 +4184,13 @@ struct query Queries2[] = { "gfsm", RETRIEVE, "fs", - FILESYS, - "fs.label, fs.type, m.name, fs.name, fs.mount, fs.access, fs.comments, u.login, l.name, text(fs.createflg), fs.lockertype, fs.modtime, text(fs.modby), fs.modwith FROM filesys fs, machine m, users u, list l", + FILESYS_TABLE, + "fs.label, fs.type, m.name, fs.name, fs.mount, fs.rwaccess, fs.comments, u.login, l.name, fs.createflg, fs.lockertype, TO_CHAR(fs.modtime, 'DD-mon-YYYY HH24:MI:SS'), 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", 1, + "fs.label", &gfsm_validate, }, @@ -2870,13 +4200,14 @@ struct query Queries2[] = { "gfsn", RETRIEVE, "fs", - FILESYS, - "fs.label, fs.type, m.name, fs.name, fs.mount, fs.access, fs.comments, u.login, l.name, text(fs.createflg), fs.lockertype, fs.modtime, text(fs.modby), fs.modwith FROM filesys fs, machine m, users u, list l, nfsphys np", + FILESYS_TABLE, + "fs.label, fs.type, m.name, fs.name, fs.mount, fs.rwaccess, fs.comments, u.login, l.name, fs.createflg, fs.lockertype, TO_CHAR(fs.modtime, 'DD-mon-YYYY HH24:MI:SS'), 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'", + "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 LIKE '%s' ESCAPE '*' AND fs.type = 'NFS'", 2, - &gfsm_validate, + "fs.label", + &gfsn_validate, }, { @@ -2885,26 +4216,44 @@ struct query Queries2[] = { "gfsg", RETRIEVE, "fs", - FILESYS, - "fs.label, fs.type, m.name, fs.name, fs.mount, fs.access, fs.comments, u.login, l.name, text(fs.createflg), fs.lockertype, fs.modtime, text(fs.modby), fs.modwith FROM filesys fs, machine m, users u, list l", + FILESYS_TABLE, + "fs.label, fs.type, m.name, fs.name, fs.mount, fs.rwaccess, fs.comments, u.login, l.name, fs.createflg, fs.lockertype, TO_CHAR(fs.modtime, 'DD-mon-YYYY HH24:MI:SS'), 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", 1, + "fs.label", &gfsg_validate, }, { - /* Q_AFIL - ADD_FILESYS */ /** Need subselect */ + /* Q_GFSP - GET_FILESYS_BY_PATH */ + "get_filesys_by_path", + "gfsp", + RETRIEVE, + "fs", + FILESYS_TABLE, + "fs.label, fs.type, m.name, fs.name, fs.mount, fs.rwaccess, fs.comments, u.login, l.name, fs.createflg, fs.lockertype, TO_CHAR(fs.modtime, 'DD-mon-YYYY HH24:MI:SS'), fs.modby, fs.modwith FROM filesys fs, machine m, users u, list l", + gfsp_fields, + 14, + "fs.name LIKE '%s' ESCAPE '*' AND m.mach_id = fs.mach_id AND fs.owner = u.users_id AND fs.owners = list_id", + 1, + "fs.label", + &VDwildfixmodby, + }, + + { + /* Q_AFIL - ADD_FILESYS */ /* uses prefetch_value() for filsys_id */ "add_filesys", "afil", APPEND, "fs", - FILESYS, - "INTO filesys (filsys_id, label, type, mach_id, name, mount, access, comments, owner, owners, createflg, lockertype) VALUES (numvalues.value,'%s','%s',%d,'%s','%s','%s','%s',%d,%d,%s,'%s')", + FILESYS_TABLE, + "INTO filesys (label, type, mach_id, name, mount, rwaccess, comments, owner, owners, createflg, lockertype, filsys_id) VALUES ('%s','%s',%d,NVL('%s',CHR(0)),'%s','%s',NVL('%s',CHR(0)),%d,%d,%s,'%s',%s)", afil_fields, 11, - "numvalues.name = 'filsys_id'", + 0, + 0, 0, &afil_validate, }, @@ -2915,12 +4264,13 @@ struct query Queries2[] = { "ufil", UPDATE, "fs", - FILESYS, - "filesys SET label = '%s', type = '%s', mach_id = %d, name = '%s', mount = '%s', access = '%s', comments = '%s', owner = %d, owners = %d, createflg = %s, lockertype = '%s'", + FILESYS_TABLE, + "filesys SET label = '%s', type = '%s', mach_id = %d, name = NVL('%s',CHR(0)), mount = '%s', rwaccess = '%s', comments = NVL('%s',CHR(0)), owner = %d, owners = %d, createflg = %s, lockertype = '%s'", ufil_fields, 11, "filsys_id = %d", 1, + 0, &ufil_validate, }, @@ -2930,42 +4280,45 @@ struct query Queries2[] = { "dfil", DELETE, "fs", - FILESYS, + FILESYS_TABLE, (char *)0, dfil_fields, 0, "filsys_id = %d", 1, + 0, &dfil_validate, }, { - /* Q_GFGM - GET_FSGROUOP_MEMBERS */ + /* Q_GFGM - GET_FSGROUP_MEMBERS */ "get_fsgroup_members", "gfgm", RETRIEVE, "fg", - "fsgroup", + FSGROUP_TABLE, "fs.label, fg.key FROM fsgroup fg, filesys fs", gfgm_fields, 2, "fg.group_id = %d AND fs.filsys_id = fg.filsys_id", 1, + "fg.key, fs.label", &gfgm_validate, }, { - /* Q_AFTG - ADD_FILESYS_TO_FSGROUP */ /** Needs subselect */ + /* Q_AFTG - ADD_FILESYS_TO_FSGROUP */ "add_filesys_to_fsgroup", "aftg", APPEND, "fg", - "fsgroup", - "INTO fsgroup (group_id,filsys_id,key) VALUES (filesys.filsys_id, %d, '%s')", + FSGROUP_TABLE, + "INTO fsgroup (group_id,filsys_id,key) VALUES (%d, %d, '%s')", gfgm_fields, - 2, - "filesys.filsys_id = %d AND filesys.type = 'FSGROUP'", - 1, + 3, + (char *)0, + 0, + 0, &aftg_validate, }, @@ -2975,12 +4328,13 @@ struct query Queries2[] = { "rffg", DELETE, "fg", - "fsgroup", + FSGROUP_TABLE, (char *)0, gfgm_fields, 0, "group_id = %d AND filsys_id = %d", 2, + 0, &aftg_validate, }, @@ -2990,13 +4344,14 @@ struct query Queries2[] = { "ganf", RETRIEVE, "np", - "nfsphys", - "m.name, np.dir, np.device, text(np.status), text(np.allocated), text(np.size), np.modtime, text(np.modby), np.modwith FROM nfsphys np, machine m", + NFSPHYS_TABLE, + "m.name, np.dir, np.device, np.status, np.allocated, np.partsize, TO_CHAR(np.modtime, 'DD-mon-YYYY HH24:MI:SS'), np.modby, np.modwith FROM nfsphys np, machine m", ganf_fields, 9, "m.mach_id = np.mach_id", 0, - &VDsortf, + "m.name, np.dir", + &VDfixmodby, }, { @@ -3005,26 +4360,28 @@ struct query Queries2[] = { "gnfp", RETRIEVE, "np", - "nfsphys", - "m.name, np.dir, np.device, text(np.status), text(np.allocated), text(np.size), np.modtime, text(np.modby), np.modwith FROM nfsphys np, machine m", + NFSPHYS_TABLE, + "m.name, np.dir, np.device, np.status, np.allocated, np.partsize, TO_CHAR(np.modtime, 'DD-mon-YYYY HH24:MI:SS'), 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", + "np.mach_id = %d AND np.dir LIKE '%s' ESCAPE '*' AND m.mach_id = np.mach_id", 2, + "m.name, np.dir", &gnfp_validate, }, { - /* Q_ANFP - ADD_NFSPHYS */ /** Needs subselect */ + /* Q_ANFP - ADD_NFSPHYS */ /* uses prefetch_value() for nfsphys_id */ "add_nfsphys", "anfp", APPEND, "np", - "nfsphys", - "INTO nfsphys (nfsphys_id, mach_id, dir, device, status, allocated, size) VALUES (numvalues.value, %d, '%s', '%s', %s, %s, %s)", + NFSPHYS_TABLE, + "INTO nfsphys (mach_id, dir, device, status, allocated, partsize, nfsphys_id) VALUES (%d, '%s', NVL('%s',CHR(0)), %s, %s, %s, %s)", ganf_fields, 6, - "numvalues.name = 'nfsphys_id'", + 0, + 0, 0, &anfp_validate, }, @@ -3035,13 +4392,14 @@ struct query Queries2[] = { "unfp", UPDATE, "np", - "nfsphys", - "nfsphys SET device = '%s', status = '%s', allocated = %s, size = %s", - gnfp_fields, + NFSPHYS_TABLE, + "nfsphys SET device = NVL('%s',CHR(0)), status = %s, allocated = %s, partsize = %s", + ganf_fields, 4, - "mach_id = %d AND dir = '%s'", + "mach_id = %d AND dir = '%s'", 2, - &anfp_validate, + 0, + &unfp_validate, }, { @@ -3050,13 +4408,14 @@ struct query Queries2[] = { "ajnf", UPDATE, "np", - "nfsphys", + NFSPHYS_TABLE, "nfsphys SET allocated = allocated + %s", - dnfp_fields, + ajnf_fields, 1, "mach_id = %d AND dir = '%s'", 2, - &anfp_validate, + 0, + &ajnf_validate, }, { @@ -3065,343 +4424,174 @@ struct query Queries2[] = { "dnfp", DELETE, "np", - "nfsphys", + NFSPHYS_TABLE, (char *)0, dnfp_fields, 0, "mach_id = %d AND dir = '%s'", 2, - &dnfp_validate, - }, - - { - /* Q_GQOT - GET_QUOTA */ - "get_quota", - "gqot", - RETRIEVE, - "q", - QUOTA, - "fs.label, q.type, text(q.entity_id), text(q.quota), text(q.phys_id), m.name, q.modtime, text(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", - 3, - &gqot_validate, - }, - - { - /* Q_GQBF - GET_QUOTA_BY_FILESYS */ - "get_quota_by_filesys", - "gqbf", - RETRIEVE, - "q", - QUOTA, - "fs.label, q.type, text(q.entity_id), text(q.quota), text(q.phys_id), m.name, q.modtime, text(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", - 1, - &gqbf_validate, - }, - - { - /* Q_AQOT - ADD_QUOTA */ /** Needs subselect */ - "add_quota", - "aqot", - APPEND, - "q", - QUOTA, - "INTO quota (filsys_id, type, entity_id, quota, phys_id) VALUES (filesys.filsys_id, '%s', %d, %s, filesys.phys_id)", - aqot_fields, - 3, - "filesys.filsys_id = %d", - 1, - &aqot_validate, - }, - - { - /* Q_UQOT - UPDATE_QUOTA */ - "update_quota", - "uqot", - UPDATE, - "q", - QUOTA, - "quota SET quota = %s", - aqot_fields, - 1, - "filsys_id = %d AND type = '%s' AND entity_id = %d", - 3, - &uqot_validate, - }, - - { - /* Q_DQOT - DELETE_QUOTA */ - "delete_quota", - "dqot", - DELETE, - "q", - QUOTA, - (char *)0, - aqot_fields, - 0, - "filsys_id = %d AND type = '%s' AND entity_id = %d", - 3, - &dqot_validate, - }, - - { - /* Q_GNFQ - GET_NFS_QUOTAS */ - "get_nfs_quota", - "gnfq", - RETRIEVE, - "q", - QUOTA, - "fs.label, u.login, text(q.quota), text(q.phys_id), m.name, q.modtime, text(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'", - 2, - &gnfq_validate, - }, - - { - /* Q_GNQP - GET_NFS_QUOTAS_BY_PARTITION */ - "get_nfs_quotas_by_partition", - "gnqp", - RETRIEVE, - "q", - QUOTA, - "fs.label, u.login, text(q.quota), np.dir, 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", - 2, - &VDmach, - }, - - { - /* Q_ANFQ - ADD_NFS_QUOTA */ /** Needs subselect */ - "add_nfs_quota", - "anfq", - APPEND, - "q", - QUOTA, - "INTO quota (filsys_id, type, entity_id, quota, phys_id) VALUES (filesys.filsys_id, 'USER', %d, %s, filesys.phys_id)", - anfq_fields, - 2, - "filesys.filsys_id = %d", - 1, - &anfq_validate, - }, - - { - /* Q_UNFQ - UPDATE_NFS_QUOTA */ - "update_nfs_quota", - "unfq", - UPDATE, - "q", - QUOTA, - "quota SET quota = %s", - anfq_fields, - 1, - "filsys_id = %d AND type = 'USER' AND entity_id = %d", - 2, - &unfq_validate, - }, - - { - /* Q_DNFQ - DELETE_NFS_QUOTA */ - "delete_nfs_quota", - "dnfq", - DELETE, - "q", - QUOTA, - (char *)0, - anfq_fields, - 0, - "filsys_id = %d AND type = 'USER' AND entity_id = %d", - 2, - &dnfq_validate, - }, - - { - /* Q_GLIN - GET_LIST_INFO */ - "get_list_info", - "glin", - RETRIEVE, - 0, - LIST, - 0, - glin_fields, - 13, - 0, - 1, - &glin_validate, - }, - - { - /* Q_EXLN - EXPAND_LIST_NAMES */ - "expand_list_names", - "exln", - RETRIEVE, - "l", - LIST, - "l.name FROM list l", - glin_fields, - 1, - "l.name = '%s' AND l.list_id != 0", - 1, - 0 + 0, + &dnfp_validate, }, - + { - /* Q_ALIS - ADD_LIST */ /** Needs numvalues subselect */ - "add_list", - "alis", - APPEND, - "l", - LIST, - "INTO list (list_id, name, active, public, hidden, maillist, grouplist, gid, acl_type, acl_id, desc) VALUES (numvalues.value,'%s',%s,%s,%s,%s,%s,%s,'%s',%d,'%s')", - alis_fields, - 10, - "numvalues.name = 'list_id'", - 0, - &alis_validate, + /* Q_GQOT - GET_QUOTA */ + "get_quota", + "gqot", + RETRIEVE, + "q", + QUOTA_TABLE, + "fs.label, q.type, q.entity_id, q.quota, q.phys_id, m.name, TO_CHAR(q.modtime, 'DD-mon-YYYY HH24:MI:SS'), q.modby, q.modwith FROM quota q, filesys fs, machine m", + gqot_fields, + 9, + "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, + "fs.label", + &gqot_validate, }, { - /* Q_ULIS - UPDATE_LIST */ - "update_list", - "ulis", - UPDATE, - "l", - LIST, - "list SET name='%s', active=%s, public=%s, hidden=%s, maillist=%s, grouplist=%s, gid=%s, acl_type='%s', acl_id=%d, desc='%s'", - ulis_fields, - 10, - "list.list_id = %d", + /* Q_GQBF - GET_QUOTA_BY_FILESYS */ + "get_quota_by_filesys", + "gqbf", + RETRIEVE, + "q", + QUOTA_TABLE, + "fs.label, q.type, q.entity_id, q.quota, q.phys_id, m.name, TO_CHAR(q.modtime, 'DD-mon-YYYY HH24:MI:SS'), q.modby, q.modwith FROM quota q, filesys fs, machine m", + gqbf_fields, + 9, + "fs.label LIKE '%s' ESCAPE '*' AND fs.filsys_id = q.filsys_id AND m.mach_id = fs.mach_id", 1, - &ulis_validate, + "fs.label, q.type", + &gqbf_validate, }, { - /* Q_DLIS - DELETE_LIST */ - "delete_list", - "dlis", - DELETE, - "l", - LIST, + /* Q_AQOT - ADD_QUOTA */ /* prefetch_filsys() gets last 1 value */ + "add_quota", + "aqot", + APPEND, + 0, + QUOTA_TABLE, + "INTO quota (filsys_id, type, entity_id, quota, phys_id) VALUES ('%s', %d, %d, %s, %s)", + aqot_fields, + 4, (char *)0, - dlis_fields, 0, - "list_id = %d", - 1, - &dlis_validate, + 0, + &aqot_validate, }, { - /* Q_AMTL - ADD_MEMBER_TO_LIST */ - "add_member_to_list", - "amtl", - APPEND, + /* Q_UQOT - UPDATE_QUOTA */ + "update_quota", + "uqot", + UPDATE, 0, - "imembers", + QUOTA_TABLE, + "quota SET quota = %s", + aqot_fields, + 1, 0, - amtl_fields, 3, - (char *)0, 0, - &amtl_validate, + &uqot_validate, }, { - /* Q_DMFL - DELETE_MEMBER_FROM_LIST */ - "delete_member_from_list", - "dmfl", + /* Q_DQOT - DELETE_QUOTA */ + "delete_quota", + "dqot", DELETE, 0, - "imembers", + QUOTA_TABLE, (char *)0, - amtl_fields, + aqot_fields, 0, 0, 3, - &dmfl_validate, + 0, + &dqot_validate, }, { - /* Q_GAUS - GET_ACE_USE */ - "get_ace_use", - "gaus", + /* Q_GNFQ - GET_NFS_QUOTAS */ + "get_nfs_quota", + "gnfq", RETRIEVE, - 0, - 0, - 0, - gaus_fields, - 2, - 0, + "q", + QUOTA_TABLE, + "fs.label, u.login, q.quota, q.phys_id, m.name, TO_CHAR(q.modtime, 'DD-mon-YYYY HH24:MI:SS'), q.modby, q.modwith FROM quota q, filesys fs, users u, machine m", + gnfq_fields, + 8, + "fs.label LIKE '%s' ESCAPE '*' 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'", 2, - &gaus_validate, + "fs.label, u.login", + &gnfq_validate, }, { - /* Q_QGLI - QUALIFIED_GET_LISTS */ - "qualified_get_lists", - "qgli", + /* Q_GNQP - GET_NFS_QUOTAS_BY_PARTITION */ + "get_nfs_quotas_by_partition", + "gnqp", RETRIEVE, - 0, - LIST, - 0, - qgli_fields, - 1, - 0, + "q", + QUOTA_TABLE, + "fs.label, u.login, q.quota, np.dir, m.name FROM quota q, filesys fs, users u, nfsphys np, machine m", + gnqp_fields, 5, - &qgli_validate, + "np.mach_id = %d AND np.dir LIKE '%s' ESCAPE '*' 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", + 2, + "fs.label, np.dir, u.login", + &gnqp_validate, }, { - /* Q_GMOL - GET_MEMBERS_OF_LIST */ - "get_members_of_list", - "gmol", - RETRIEVE, - (char *)0, - "imembers", - (char *)0, - gmol_fields, + /* Q_ANFQ - ADD_NFS_QUOTA */ /* prefetch_filsys() gets last 1 value */ + "add_nfs_quota", + "anfq", + APPEND, 0, + QUOTA_TABLE, + "INTO quota (type, filsys_id, entity_id, quota, phys_id ) VALUES ('USER', %d, %d, %s, %s)", + anfq_fields, + 3, (char *)0, - 1, - &gmol_validate, + 0, + 0, + &anfq_validate, }, { - /* Q_GLOM - GET_LISTS_OF_MEMBER */ - "get_lists_of_member", - "glom", - RETRIEVE, - 0, - "imembers", + /* Q_UNFQ - UPDATE_NFS_QUOTA */ + "update_nfs_quota", + "unfq", + UPDATE, 0, - glom_fields, - 6, + QUOTA_TABLE, + "quota SET quota = %s", + anfq_fields, + 1, 0, 2, - &glom_validate, + 0, + &unfq_validate, }, { - /* Q_CMOL - COUNT_MEMBERS_OF_LIST */ - "count_members_of_list", - "cmol", - RETRIEVE, + /* Q_DNFQ - DELETE_NFS_QUOTA */ + "delete_nfs_quota", + "dnfq", + DELETE, 0, - "imembers", + QUOTA_TABLE, + (char *)0, + anfq_fields, 0, - cmol_fields, - 1, 0, - 1, - &cmol_validate, + 2, + 0, + &dnfq_validate, }, { @@ -3410,14 +4600,15 @@ struct query Queries2[] = { "gzcl", RETRIEVE, "z", - "zephyr", - "class, xmt_type, text(xmt_id),sub_type, text(sub_id),iws_type, text(iws_id),iui_type, text(iui_id), modtime, text(modby), modwith FROM zephyr", + ZEPHYR_TABLE, + "class, xmt_type, xmt_id, sub_type, sub_id, iws_type, iws_id, iui_type, iui_id, TO_CHAR(modtime, 'DD-mon-YYYY HH24:MI:SS'), modby, modwith FROM zephyr", gzcl_fields, 12, - "class = '%s'", + "class LIKE '%s' ESCAPE '*'", 1, + "class", &gzcl_validate, - }, + }, { /* Q_AZCL - ADD_ZEPHYR_CLASS */ @@ -3425,12 +4616,13 @@ struct query Queries2[] = { "azcl", APPEND, "z", - "zephyr", + ZEPHYR_TABLE, "INTO zephyr (class, xmt_type, xmt_id, sub_type, sub_id, iws_type, iws_id, iui_type, iui_id) VALUES ('%s','%s',%d,'%s',%d,'%s',%d,'%s',%d)", azcl_fields, 9, 0, 0, + 0, &azcl_validate, }, @@ -3440,12 +4632,13 @@ struct query Queries2[] = { "uzcl", 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_TABLE, + "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'", 1, + 0, &uzcl_validate, }, @@ -3455,28 +4648,94 @@ struct query Queries2[] = { "dzcl", DELETE, "z", - "zephyr", + ZEPHYR_TABLE, 0, uzcl_fields, 0, "class = '%s'", 1, + 0, &dzcl_validate, }, + { + /* Q_GSHA - GET_SERVER_HOST_ACCESS */ + "get_server_host_access", + "gsha", + RETRIEVE, + "ha", + HOSTACCESS_TABLE, + "m.name, ha.acl_type, ha.acl_id, TO_CHAR(ha.modtime, 'DD-mon-YYYY HH24:MI:SS'), ha.modby, ha.modwith FROM hostaccess ha, machine m", + gsha_fields, + 6, + "m.name LIKE '%s' ESCAPE '*' AND ha.mach_id = m.mach_id", + 1, + "m.name", + &gsha_validate, + }, + + { + /* Q_ASHA - ADD_SERVER_HOST_ACCESS */ + "add_server_host_access", + "asha", + APPEND, + "ha", + HOSTACCESS_TABLE, + "INTO hostaccess (mach_id, acl_type, acl_id) VALUES (%d,'%s',%d)", + asha_fields, + 3, + 0, + 0, + 0, + &asha_validate, + }, + + { + /* Q_USHA - UPDATE_SERVER_HOST_ACCESS */ + "update_server_host_access", + "usha", + UPDATE, + "ha", + HOSTACCESS_TABLE, + "hostaccess SET acl_type = '%s', acl_id = %d", + asha_fields, + 2, + "mach_id = %d", + 1, + 0, + &asha_validate, + }, + + { + /* Q_DSHA - DELETE_SERVER_HOST_ACCESS */ + "delete_server_host_access", + "dsha", + DELETE, + "ha", + HOSTACCESS_TABLE, + 0, + asha_fields, + 0, + "mach_id = %d", + 1, + 0, + &VDmach, + }, + { /* Q_GSVC - GET_SERVICE */ "get_service", "gsvc", RETRIEVE, - "s", - "services", - "name, protocol, text(port), desc, modtime, text(modby), modwith FROM services", + "ss", + SERVICES_TABLE, + "name, protocol, port, description, TO_CHAR(modtime, 'DD-mon-YYYY HH24:MI:SS'), modby, modwith FROM services", gsvc_fields, 7, - "name = '%s'", + "name LIKE '%s' ESCAPE '*'", 1, - &VDsortf, + "name, protocol", + &VDwildfixmodby, }, { @@ -3484,13 +4743,14 @@ struct query Queries2[] = { "add_service", "asvc", APPEND, - "s", - "services", - "INTO services (name, protocol, port, desc) VALUES ('%s','%s',%s,'%s')", + "ss", + SERVICES_TABLE, + "INTO services (name, protocol, port, description) VALUES ('%s','%s',%s,NVL('%s',CHR(0)))", asvc_fields, 4, (char *)0, 0, + 0, &asvc_validate, }, @@ -3499,13 +4759,14 @@ struct query Queries2[] = { "delete_service", "dsvc", DELETE, - "s", - "services", + "ss", + SERVICES_TABLE, 0, asvc_fields, 0, "name = '%s'", 1, + 0, &asvc_validate, }, @@ -3514,13 +4775,14 @@ struct query Queries2[] = { "get_printcap_entry", "gpce", RETRIEVE, - "p", - "printcap", - "p.name, m.name, p.dir, p.rp, text(p.quotaserver), text(p.auth), text(p.price), p.comments, p.modtime, text(p.modby), p.modwith FROM printcap p, machine m", + "pc", + PRINTCAP_TABLE, + "pc.name, m.name, pc.dir, pc.rp, pc.quotaserver, pc.auth, pc.price, pc.comments, TO_CHAR(pc.modtime, 'DD-mon-YYYY HH24:MI:SS'), pc.modby, pc.modwith FROM printcap pc, machine m", gpce_fields, 11, - "p.name = '%s' AND m.mach_id = p.mach_id", + "pc.name LIKE '%s' ESCAPE '*' AND m.mach_id = pc.mach_id", 1, + "pc.name", &gpce_validate, }, @@ -3529,13 +4791,14 @@ struct query Queries2[] = { "add_printcap_entry", "apce", APPEND, - "p", - "printcap", - "INTO printcap (name, mach_id, dir, rp, quotaserver, auth, price, comments) VALUES ('%s',%d,'%s','%s',%d,%s,%s,'%s')", + "pc", + PRINTCAP_TABLE, + "INTO printcap (name, mach_id, dir, rp, quotaserver, auth, price, comments) VALUES ('%s',%d,'%s','%s',%d,%s,%s,NVL('%s',CHR(0)))", apce_fields, 8, 0, 0, + 0, &apce_validate, }, @@ -3544,13 +4807,14 @@ struct query Queries2[] = { "delete_printcap_entry", "dpce", DELETE, - "p", - "printcap", + "pc", + PRINTCAP_TABLE, 0, apce_fields, 0, "name = '%s'", 1, + 0, &dpce_validate, }, @@ -3559,14 +4823,15 @@ struct query Queries2[] = { "get_printcap", "gpcp", RETRIEVE, - "p", - "printcap", - "p.name, m.name, p.dir, p.rp, p.comments, p.modtime, text(p.modby), p.modwith FROM printcap p, machine m", + "pc", + PRINTCAP_TABLE, + "pc.name, m.name, pc.dir, pc.rp, pc.comments, TO_CHAR(pc.modtime, 'DD-mon-YYYY HH24:MI:SS'), pc.modby, pc.modwith FROM printcap pc, machine m", gpcp_fields, 8, - "p.name = '%s' AND m.mach_id = p.mach_id", + "pc.name LIKE '%s' ESCAPE '*' AND m.mach_id = pc.mach_id", 1, - &VDsortf, + "pc.name", + &VDwildfixmodby, }, { @@ -3574,13 +4839,14 @@ struct query Queries2[] = { "delete_printcap", "dpcp", DELETE, - "p", - "printcap", + "pc", + PRINTCAP_TABLE, 0, apce_fields, 0, "name = '%s'", 1, + 0, &dpce_validate, }, @@ -3589,14 +4855,15 @@ struct query Queries2[] = { "get_palladium", "gpdm", RETRIEVE, - "p", - "palladium", - "p.name, text(p.ident), m.name, p.modtime, text(p.modby), p.modwith FROM palladium p, machine m", + "pal", + PALLADIUM_TABLE, + "pal.name, pal.identifier, m.name, TO_CHAR(pal.modtime, 'DD-mon-YYYY HH24:MI:SS'), pal.modby, pal.modwith FROM palladium pal, machine m", gpdm_fields, 6, - "p.name = '%s' AND m.mach_id = p.mach_id", + "pal.name LIKE '%s' ESCAPE '*' AND m.mach_id = pal.mach_id", 1, - &VDsortf, + "pal.name", + &VDwildfixmodby, }, { @@ -3604,13 +4871,14 @@ struct query Queries2[] = { "add_palladium", "apdm", APPEND, - "p", - "palladium", - "INTO palladium (name, ident, mach_id) VALUES ('%s',%s,%d)", + "pal", + PALLADIUM_TABLE, + "INTO palladium (name, identifier, mach_id) VALUES ('%s',%s,%d)", apdm_fields, 3, 0, 0, + 0, &apdm_validate, }, @@ -3619,13 +4887,14 @@ struct query Queries2[] = { "delete_palladium", "dpdm", DELETE, - "p", - "palladium", + "pal", + PALLADIUM_TABLE, 0, apdm_fields, 0, "name = '%s'", 1, + 0, &dpdm_validate, }, @@ -3635,13 +4904,14 @@ struct query Queries2[] = { "gali", RETRIEVE, "a", - "alias", + ALIAS_TABLE, "name, type, 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, + "name, type, trans", + &VDwild3, }, { @@ -3650,12 +4920,13 @@ struct query Queries2[] = { "aali", APPEND, "a", - "alias", + ALIAS_TABLE, "INTO alias (name, type, trans) VALUES ('%s', '%s', '%s')", aali_fields, 3, (char *)0, 0, + 0, &aali_validate, }, @@ -3665,12 +4936,13 @@ struct query Queries2[] = { "dali", DELETE, "a", - "alias", + ALIAS_TABLE, (char *)0, aali_fields, 0, - "name = '%s' AND type = '%s' AND trans = '%s'", + "name = '%s' AND type = '%s' AND trans = '%s'", 3, + 0, &dali_validate, }, @@ -3679,13 +4951,14 @@ struct query Queries2[] = { "get_value", "gval", RETRIEVE, - "v", - "numvalues", - "text(value) FROM numvalues", + "val", + NUMVALUES_TABLE, + "value FROM numvalues", gval_fields, 1, "name = '%s'", 1, + 0, &gval_validate, }, @@ -3694,13 +4967,14 @@ struct query Queries2[] = { "add_value", "aval", APPEND, - "v", - "numvalues", + "val", + NUMVALUES_TABLE, "INTO numvalues (name, value) VALUES ('%s', %s)", aval_fields, 2, (char *)0, 0, + 0, &aval_validate, }, @@ -3709,13 +4983,14 @@ struct query Queries2[] = { "update_value", "uval", UPDATE, - "v", - "numvalues", + "val", + NUMVALUES_TABLE, "numvalues SET value = %s", aval_fields, 1, "name = '%s'", 1, + 0, &aval_validate, }, @@ -3724,13 +4999,14 @@ struct query Queries2[] = { "delete_value", "dval", DELETE, - "v", - "numvalues", + "val", + NUMVALUES_TABLE, (char *)0, dval_fields, 0, "name = '%s'", 1, + 0, &aval_validate, }, @@ -3740,13 +5016,30 @@ struct query Queries2[] = { "gats", RETRIEVE, "tbs", - "tblstats", - "tbs.table_name, text(tbs.retrieves), text(tbs.appends), text(tbs.updates), text(tbs.deletes), tbs.modtime FROM tblstats tbs", + TBLSTATS_TABLE, + "table_name, appends, updates, deletes, TO_CHAR(modtime, 'DD-mon-YYYY HH24:MI:SS') FROM tblstats", gats_fields, - 6, + 5, + (char *)0, + 0, + "table_name", + 0, + }, + + { + /* Q__SDL - _SET_DEBUG_LEVEL */ + "_set_debug_level", + "_sdl", + UPDATE, + (char *)0, + 0, + (char *)0, + _sdl_fields, + 1, (char *)0, 0, 0, + &_sdl_validate, }, };