X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/a66a22040bb94e1a24ca447779c98a40c45213e7..52581841cb40c0c5f7455dbf9fb802857fe7a0f3:/server/queries2.c diff --git a/server/queries2.c b/server/queries2.c index 315578f6..31644d21 100644 --- a/server/queries2.c +++ b/server/queries2.c @@ -1,389 +1,207 @@ -/* This file defines the query dispatch table for version 2 of the protocol +/* $Id$ * - * $Header$ + * This file defines the query dispatch table * - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. + * Copyright (C) 1987-1998 by the Massachusetts Institute of Technology. * For copying and distribution information, please see the file * . */ #include +#include "mr_server.h" #include "query.h" -#include "mr_et.h" - -/* Specialized Support Query Routines */ - -/* Special Access Check Routines */ -int access_user(); -int access_login(); -int access_list(); -int access_visible_list(); -int access_vis_list_by_name(); -int access_member(); -int access_qgli(); -int access_service(); -int access_filesys(); -int access_host(); -int access_ahal(); - -/* 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(); -int setup_dsin(); -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(); -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(); -int set_finger_modtime(); -int set_pobox_modtime(); -int set_uppercase_modtime(); -int set_mach_modtime_by_id(); -int set_cluster_modtime_by_id(); -int set_serverhost_modtime(); -int set_nfsphys_modtime(); -int set_filesys_modtime(); -int set_zephyr_modtime(); - -/* Special Queries */ -int set_pobox(); -int get_list_info(); -int add_member_to_list(); -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(); - - - -/* String compression - * These are commonly used strings in the table, defined here so that - * they can be shared. - */ - -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 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 LABEL[] = "label"; -static char LAST[] = "lastname"; -static char LIST[] = "list"; -static char LIST_ID[] = "list_id"; -static char LOCATION[] = "location"; -static char LOGIN[] = "login"; -static char MACH_ID[] = "mach_id"; -static char MACHINE[] = "machine"; -static char MIDDLE[] = "middle"; -static char MIT_ID[] = "clearid"; -static char MOD1[] = "modtime"; -static char MOD2[] = "modby"; -static char MOD3[] = "modwith"; -static char NAME[] = "name"; -static char QUOTA[] = "quota"; -static char QUOTA_TYPE[] = "quota_type"; -static char SECURE[] = "secure"; -static char SERVICE[] = "service"; -static char SHELL[] = "shell"; -static char SIGNATURE[] = "signature"; -static char SNET_ID[] = "snet_id"; -static char SUBNET[] = "subnet"; -static char STATUS[] = "status"; -static char TYPE[] = "type"; -static char USERS[] = "users"; -static char USERS_ID[] = "users_id"; -static char UID[] = "uid"; - +#include "mr_et.h" /* VALOBJS * These are commonly used validation objects, defined here so that they * can be shared. */ -static struct valobj VOsort0[] = { - {V_SORT, 0}, -}; - -static struct valobj VOwild0[] = { - {V_WILD, 0}, -}; - -static struct valobj VOupwild0[] = { - {V_UPWILD, 0}, -}; - -static struct valobj VOwild0sort[] = { - {V_WILD, 0}, - {V_SORT, 0}, -}; - -static struct valobj VOupwild0sort[] = { - {V_UPWILD, 0}, - {V_SORT, 0}, -}; - -static struct valobj VOwild01sort0[] = { - {V_WILD, 0}, - {V_WILD, 1}, - {V_SORT, 0}, -}; - -static struct valobj VOwild01sort01[] = { - {V_WILD, 0}, - {V_WILD, 1}, - {V_SORT, 0}, - {V_SORT, 1}, -}; - -static struct valobj VOwild012sort0[] = { /* get_alias */ - {V_WILD, 0}, - {V_WILD, 1}, - {V_WILD, 2}, - {V_SORT, 0}, -}; - -static struct valobj VOdate1[] = { - {V_DATE, 1, 0, 0, 0, MR_DATE}, -}; - static struct valobj VOuser0[] = { - {V_ID, 0, USERS, 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_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}, -}; - -static struct valobj VOlist0[] = { - {V_ID, 0, LIST, NAME, LIST_ID, MR_LIST}, + {V_ID, 0, CLUSTERS_TABLE, "name", "clu_id", MR_CLUSTER}, }; -static struct valobj VOfilsys0[] = { - {V_ID, 0, FILESYS, LABEL, FILSYS_ID, MR_FILESYS}, +static struct valobj VOsnet0[] = { + {V_ID, 0, SUBNET_TABLE, "name", "snet_id", MR_SUBNET}, }; -static struct valobj VOchar0[] = { - {V_CHAR, 0}, +static struct valobj VOlist0[] = { + {V_ID, 0, LIST_TABLE, "name", "list_id", MR_LIST}, }; -static struct valobj VOsort01[] = { - {V_SORT, 1}, - {V_SORT, 0}, +static struct valobj VOfilesys0[] = { + {V_ID, 0, FILESYS_TABLE, "label", "filsys_id", MR_FILESYS}, }; -static struct valobj VOuser0sort[] = { - {V_ID, 0, USERS, LOGIN, USERS_ID, MR_USER}, - {V_SORT, 0}, +static struct valobj VOcon0[] = { + {V_ID, 0, CONTAINERS_TABLE, "name", "cnt_id", MR_CONTAINER}, }; -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}, +static struct valobj VOnum0[] = { + {V_NUM, 0}, }; - /* Validations * Commonly used validation records defined here so that they may * be shared. */ static struct validate VDmach = { VOmach0, 1 }; -static struct validate VDsort0= { VOsort0, 1 }; -static struct validate VDwild0= { VOwild0, 1 }; -static struct validate VDupwild0= { VOupwild0, 1 }; -static struct validate VDsort2= { VOsort01,2 }; -static struct validate VDwild2sort2 = { VOwild01sort01,4 }; -static struct validate VDwild3sort1 = { VOwild012sort0,4 }; -static struct validate VDsortf = { - VOsort0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - followup_fix_modby, -}; - -static struct validate VDwildsortf = { - VOwild0sort, - 2, - 0, - 0, - 0, - 0, - 0, - 0, - followup_fix_modby, -}; -static struct validate VDwild2sortf = { - VOwild01sort01, - 4, - 0, +static struct validate VDfix_modby = { 0, 0, 0, 0, 0, - followup_fix_modby, -}; - -static struct validate VDupwildsortf = { - VOupwild0sort, - 2, - 0, - 0, - 0, 0, 0, 0, followup_fix_modby, }; - - /* Query data */ +static char *galo2_fields[] = { + "login", "unix_uid", "shell", "last", "first", "middle", +}; + static char *galo_fields[] = { - LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", +}; + +static char *gual2_fields[] = { + "login", + "login", "unix_uid", "shell", "last", "first", "middle", "status", + "clearid", "class", "comments", "signature", "secure", + "modtime", "modby", "modwith", }; static char *gual_fields[] = { - LOGIN, - LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, STATUS, - MIT_ID, CLASS, COMMENTS, SIGNATURE, SECURE, MOD1, MOD2, MOD3, + "login", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "comments", "signature", "secure", + "modtime", "modby", "modwith", +}; + +static char *gubl2_fields[] = { + "login", + "login", "unix_uid", "shell", "last", "first", "middle", "status", + "clearid", "class", "modtime", "modby", "modwith", }; static char *gubl_fields[] = { - LOGIN, - LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, STATUS, - MIT_ID, CLASS, MOD1, MOD2, MOD3, + "login", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "modtime", "modby", "modwith", }; -static struct validate gubl_validate = +static struct validate gubl_validate = { - VOwild0sort, - 2, + 0, + 0, 0, 0, 0, 0, access_login, 0, - followup_guax, + followup_fix_modby, +}; + +static char *guau2_fields[] = { + "unix_uid", + "login", "unix_uid", "shell", "last", "first", "middle", "status", + "clearid", "class", "comments", "signature", "secure", + "modtime", "modby", "modwith", }; static char *guau_fields[] = { - UID, - LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, STATUS, - MIT_ID, CLASS, COMMENTS, SIGNATURE, SECURE, MOD1, MOD2, MOD3, + "unix_uid", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "comments", "signature", "secure", + "modtime", "modby", "modwith", +}; + +static char *guan2_fields[] = { + "first", "last", + "login", "unix_uid", "shell", "last", "first", "middle", "status", + "clearid", "class", "comments", "signature", "secure", + "modtime", "modby", "modwith", }; static char *guan_fields[] = { - FIRST, LAST, - LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, STATUS, - MIT_ID, CLASS, COMMENTS, SIGNATURE, SECURE, MOD1, MOD2, MOD3, + "first", "last", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "comments", "signature", "secure", + "modtime", "modby", "modwith", }; -static struct validate guan_validate = +static struct validate guan_validate = { - VOwild01sort01, - 4, 0, 0, 0, 0, 0, 0, - followup_guax, + 0, + 0, + followup_fix_modby, +}; + +static char *guac2_fields[] = { + "class", + "login", "unix_uid", "shell", "last", "first", "middle", "status", + "clearid", "class", "comments", "signature", "secure", + "modtime", "modby", "modwith", }; static char *guac_fields[] = { - CLASS, - LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, STATUS, - MIT_ID, CLASS, COMMENTS, SIGNATURE, SECURE, MOD1, MOD2, MOD3, + "class", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "comments", "signature", "secure", + "modtime", "modby", "modwith", +}; + +static char *guam2_fields[] = { + "clearid", + "login", "unix_uid", "shell", "last", "first", "middle", "status", + "clearid", "class", "comments", "signature", "secure", + "modtime", "modby", "modwith", }; static char *guam_fields[] = { - MIT_ID, - LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, STATUS, - MIT_ID, CLASS, COMMENTS, SIGNATURE, SECURE, MOD1, MOD2, MOD3, + "clearid", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "comments", "signature", "secure", + "modtime", "modby", "modwith", +}; + +static char *gubu2_fields[] = { + "unix_uid", + "login", "unix_uid", "shell", "last", "first", "middle", "status", + "clearid", "class", "modtime", "modby", "modwith", }; static char *gubu_fields[] = { - UID, - LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, STATUS, - MIT_ID, CLASS, MOD1, MOD2, MOD3, + "unix_uid", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "modtime", "modby", "modwith", }; -static struct validate gubu_validate = +static struct validate gubu_validate = { - VOsort0, + VOnum0, 1, 0, 0, @@ -394,16 +212,22 @@ static struct validate gubu_validate = followup_fix_modby, }; +static char *gubn2_fields[] = { + "first", "last", + "login", "unix_uid", "shell", "last", "first", "middle", "status", + "clearid", "class", "modtime", "modby", "modwith", +}; + static char *gubn_fields[] = { - FIRST, LAST, - LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, STATUS, - MIT_ID, CLASS, MOD1, MOD2, MOD3, + "first", "last", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "modtime", "modby", "modwith", }; static struct validate gubn_validate = { - VOwild01sort0, - 3, + 0, + 0, 0, 0, 0, @@ -413,41 +237,100 @@ static struct validate gubn_validate = followup_fix_modby, }; +static char *gubc2_fields[] = { + "class", + "login", "unix_uid", "shell", "last", "first", "middle", "status", + "clearid", "class", "modtime", "modby", "modwith", +}; + static char *gubc_fields[] = { - CLASS, - LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, STATUS, - MIT_ID, CLASS, MOD1, MOD2, MOD3, + "class", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "modtime", "modby", "modwith", +}; + +static char *gubm2_fields[] = { + "clearid", + "login", "unix_uid", "shell", "last", "first", "middle", "status", + "clearid", "class", "modtime", "modby", "modwith", }; static char *gubm_fields[] = { - MIT_ID, - LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, STATUS, - MIT_ID, CLASS, MOD1, MOD2, MOD3, + "clearid", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", + "middle", "status", "clearid", "class", "modtime", "modby", "modwith", +}; + +static char *auac2_fields[] = { + "login", "unix_uid", "shell", "last", "first", "middle", "status", + "clearid", "class", "comments", "signature", "secure", }; static char *auac_fields[] = { - LOGIN, UID, SHELL, LAST, FIRST, MIDDLE, STATUS, - MIT_ID, CLASS, COMMENTS, SIGNATURE, SECURE, + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", + "middle", "status", "clearid", "class", "comments", "signature", "secure", +}; + +static struct valobj auac2_valobj[] = { + {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, "clearid"}, + {V_TYPE, 8, 0, "class", 0, MR_BAD_CLASS}, + {V_ID, 9, STRINGS_TABLE, "string", "string_id", MR_NO_MATCH}, + {V_NUM, 11}, }; static struct valobj auac_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}, - {V_ID, 9, "strings", "string", "string_id", MR_NO_MATCH}, + {V_CHAR, 0, USERS_TABLE, "login"}, + {V_NUM, 1}, + {V_CHAR, 2, USERS_TABLE, "shell"}, + {V_CHAR, 3, USERS_TABLE, "winconsoleshell"}, + {V_CHAR, 4, USERS_TABLE, "last"}, + {V_CHAR, 5, USERS_TABLE, "first"}, + {V_CHAR, 6, USERS_TABLE, "middle"}, + {V_NUM, 7}, + {V_CHAR, 8, USERS_TABLE, "clearid"}, + {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 auac2_validate = { + auac2_valobj, + 11, + "login", + "login = '%s'", + 1, + "users_id", + 0, + setup_ausr, + followup_ausr, }; static struct validate auac_validate = { auac_valobj, - 8, - LOGIN, - "login = LEFT('%s',SIZE(login))", + 12, + "login", + "login = '%s'", + 1, + "users_id", + 0, + setup_ausr, + followup_ausr, +}; + +static struct validate ausr2_validate = { + auac2_valobj, + 9, + "login", + "login = '%s'", 1, - USERS_ID, + "users_id", 0, setup_ausr, followup_ausr, @@ -455,30 +338,28 @@ static struct validate auac_validate = { static struct validate ausr_validate = { auac_valobj, - 7, - LOGIN, - "login = LEFT('%s',SIZE(login))", + 10, + "login", + "login = '%s'", 1, - USERS_ID, + "users_id", 0, setup_ausr, followup_ausr, }; static char *rusr_fields[] = { - UID, LOGIN, "fs_type" - }; + "unix_uid", "login", "pobox_type" +}; 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_NUM, 0}, + {V_CHAR, 1, USERS_TABLE, "login"}, }; static struct validate rusr_validate = { rusr_valobj, - 4, + 2, 0, 0, 0, @@ -488,94 +369,176 @@ static struct validate rusr_validate = { 0, }; -static char *uuac_fields[] = { - LOGIN, - "newlogin", UID, SHELL, LAST, FIRST, MIDDLE, STATUS, - MIT_ID, CLASS, COMMENTS, SIGNATURE, SECURE, +static char *uuac2_fields[] = { + "login", + "newlogin", "unix_uid", "shell", "last", "first", "middle", "status", + "clearid", "class", "comments", "signature", "secure", }; +static char *uuac_fields[] = { + "login", + "newlogin", "unix_uid", "shell", "winconsoleshell", "last", "first", + "middle", "status", "clearid", "class", "comments", "signature", "secure", +}; + +static struct valobj uuac2_valobj[] = { + {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, "clearid"}, + {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 valobj uuac_valobj[] = { - {V_LOCK, 0, USERS, 0, USERS_ID, MR_DEADLOCK}, - {V_ID, 0, USERS, LOGIN, USERS_ID, MR_USER}, - {V_RENAME, 1, USERS, LOGIN, USERS_ID, MR_NOT_UNIQUE}, - {V_CHAR, 4}, - {V_CHAR, 5}, - {V_CHAR, 6}, - {V_CHAR, 8}, - {V_TYPE, 9, CLASS, 0, 0, MR_BAD_CLASS}, - {V_ID, 10, "strings", "string", "string_id", MR_NO_MATCH}, + {V_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, "winconsoleshell"}, + {V_CHAR, 5, USERS_TABLE, "first"}, + {V_CHAR, 6, USERS_TABLE, "last"}, + {V_CHAR, 7, USERS_TABLE, "middle"}, + {V_NUM, 8}, + {V_CHAR, 9, USERS_TABLE, "clearid"}, + {V_TYPE, 10, 0, "class", 0, MR_BAD_CLASS}, + {V_ID, 11, STRINGS_TABLE, "string", "string_id", MR_NO_MATCH}, + {V_NUM, 13}, +}; + +static struct validate uuac2_validate = { + uuac2_valobj, + 12, + 0, + 0, + 0, + "users_id", + 0, + setup_ausr, + set_modtime_by_id, }; static struct validate uuac_validate = { uuac_valobj, - 9, + 13, + 0, 0, 0, + "users_id", 0, - USERS_ID, + setup_ausr, + set_modtime_by_id, +}; + +static struct validate uusr2_validate = { + uuac2_valobj, + 10, + 0, + 0, + 0, + "users_id", 0, setup_ausr, - followup_uuac, + set_modtime_by_id, }; static struct validate uusr_validate = { uuac_valobj, - 8, + 11, 0, 0, 0, - USERS_ID, + "users_id", 0, setup_ausr, set_modtime_by_id, }; static char *uush_fields[] = { - LOGIN, - SHELL, + "login", + "shell", +}; + +static struct valobj uush_valobj[] = { + {V_ID, 0, USERS_TABLE, "login", "users_id", MR_USER}, + {V_CHAR, 1, USERS_TABLE, "shell"}, }; static struct validate uush_validate = { - VOuser0lock, + uush_valobj, 2, 0, 0, 0, - USERS_ID, + "users_id", access_user, 0, - set_modtime_by_id, + set_finger_modtime, +}; + +static char *uuws_fields[] = { + "login", + "winconsoleshell", +}; + +static struct valobj uuws_valobj[] = { + {V_ID, 0, USERS_TABLE, "login", "users_id", MR_USER}, + {V_CHAR, 1, USERS_TABLE, "winconsoleshell"}, +}; + +static struct validate uuws_validate = { + uuws_valobj, + 2, + 0, + 0, + 0, + "users_id", + access_user, + 0, + set_finger_modtime, }; static char *uust_fields[] = { - LOGIN, - STATUS, + "login", + "status", }; static char *uuss_fields[] = { - LOGIN, - SECURE, + "login", + "secure", +}; + +static struct valobj uust_valobj[] = { + {V_ID, 0, USERS_TABLE, "login", "users_id", MR_USER}, + {V_NUM, 1}, + {V_NUM, 2}, }; static struct validate uust_validate = { - VOuser0lock, + uust_valobj, 2, 0, 0, 0, - USERS_ID, + "users_id", 0, 0, set_modtime_by_id, }; static char *dusr_fields[] = { - LOGIN, + "login", }; static struct validate dusr_validate = { - VOuser0lock, - 2, + VOuser0, + 1, 0, 0, 0, @@ -585,48 +548,77 @@ static struct validate dusr_validate = { 0, }; -static char *dubu_fields[] = { - UID, +static char *aurv_fields[] = { + "login", "reservation", }; -static struct valobj dubu_valobj[] = { - {V_LOCK, 0, USERS, 0, USERS_ID, MR_DEADLOCK}, - {V_ID, 0, USERS, UID, USERS_ID, MR_USER} +static struct validate aurv_validate = { + VOuser0, + 1, + 0, + 0, + 0, + "users_id", + 0, + 0, + do_user_reservation, }; -static struct validate dubu_validate = { - dubu_valobj, - 2, +static char *gurv_fields[] = { + "login", + "reservation", +}; + +static struct validate gurv_validate = { + VOuser0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + get_user_reservations, +}; + +static char *gubr_fields[] = { + "reservation", + "login", +}; + +static struct validate gubr_validate = { + 0, 0, 0, 0, 0, 0, - setup_dusr, 0, + 0, + get_user_by_reservation, }; -static char *gkum_fields[] = { LOGIN, "kerberos", - LOGIN, "kerberos" }; +static char *gkum_fields[] = { "login", "kerberos", + "login", "kerberos" }; -static char *akum_fields[] = { LOGIN, "kerberos" }; +static char *akum_fields[] = { "login", "kerberos" }; static struct valobj akum_valobj[] = { - {V_ID, 0, USERS, LOGIN, USERS_ID, MR_USER}, - {V_ID, 1, "strings", "string", "string_id", MR_NO_MATCH}, + {V_ID, 0, USERS_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, + 2, + "users_id", "users_id = %d or string_id = %d", 2, - USERS_ID, + "users_id", access_user, - setup_akum, + 0, 0, }; @@ -634,20 +626,20 @@ static struct validate dkum_validate = { akum_valobj, 2, - USERS_ID, + "users_id", "users_id = %d and string_id = %d", 2, - USERS_ID, + "users_id", access_user, 0, 0, }; static char *gfbl_fields[] = { - LOGIN, - LOGIN, "fullname", "nickname", "home_addr", - "home_phone", "office_addr", "office_phone", "department", - "affiliation", MOD1, MOD2, MOD3, + "login", + "login", "fullname", "nickname", "home_addr", + "home_phone", "office_addr", "office_phone", "department", + "affiliation", "modtime", "modby", "modwith", }; static struct validate gfbl_validate = { @@ -663,15 +655,27 @@ static struct validate gfbl_validate = { }; static char *ufbl_fields[] = { - LOGIN, + "login", "fullname", "nickname", "home_addr", - "home_phone", "office_addr", "office_phone", "department", + "home_phone", "office_addr", "office_phone", "department", "affiliation", }; +static struct valobj ufbl_valobj[] = { + {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, + 9, 0, 0, 0, @@ -682,15 +686,15 @@ static struct validate ufbl_validate = { }; static char *gpob_fields[] = { - LOGIN, - LOGIN, TYPE, "box", MOD1, MOD2, MOD3, + "login", + "login", "type", "box", "address", "modtime", "modby", "modwith", }; static struct validate gpob_validate = { VOuser0, 1, "potype", - "potype != 'NONE' and users_id=%d", + "potype != 'NONE' and users_id = %d", 1, 0, access_user, @@ -699,7 +703,7 @@ static struct validate gpob_validate = { }; static char *gpox_fields[] = { - LOGIN, TYPE, "box", + "login", "type", "box", }; static struct validate gpox_validate = { @@ -715,45 +719,44 @@ static struct validate gpox_validate = { }; static char *spob_fields[] = { - LOGIN, TYPE, "box", + "login", "type", "box", }; 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_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, + 2, 0, 0, 0, 0, - access_user, + access_spob, 0, set_pobox, }; static struct validate spop_validate = /* SET_POBOX_POP */ { - VOuser0lock, - 2, + VOuser0, + 1, 0, 0, 0, 0, access_user, - setup_spop, - set_pobox_modtime, + 0, + set_pobox_pop, }; static struct validate dpob_validate = /* DELETE_POBOX */ { - VOuser0lock, - 2, + VOuser0, + 1, 0, 0, 0, @@ -764,26 +767,45 @@ static struct validate dpob_validate = /* DELETE_POBOX */ }; static char *gmac_fields[] = { - NAME, - NAME, TYPE, MOD1, MOD2, MOD3, + "name", + "name", "type", "modtime", "modby", "modwith", +}; + +static char *ghst2_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", "modtime", "modby", "modwith", +}; + +static char *ghbh2_fields[] = { + "hwaddr", + "name", "vendor", "model", "os", "location", "contact", "use", + "status", "status_change", "network", "address", "ace_type", + "ace_name", "admin_comment", "ops_comment", "created", "creator", + "inuse", "modtime", "modby", "modwith", }; static char *ghst_fields[] = { - NAME, ADDRESS, "location", "contact", - NAME, "vendor", "model", "os", "location", "contact", "use", "status", "status_change", SUBNET, ADDRESS, ACE_TYPE, ACE_NAME, "admin_comment", "ops_comment", "created", "creator", "inuse", MOD1, MOD2, MOD3, + "name", "address", "location", "network", + "name", "vendor", "model", "os", "location", "contact", "billing_contact", + "use", "status", "status_change", "network", "address", "ace_type", + "ace_name", "admin_comment", "ops_comment", "created", "creator", + "inuse", "modtime", "modby", "modwith", }; -static struct valobj ghst_valobj[] = { - {V_UPWILD, 0}, - {V_UPWILD, 1}, - {V_UPWILD, 2}, - {V_UPWILD, 3}, - {V_SORT, 0}, +static char *ghbh_fields[] = { + "hwaddr", + "name", "vendor", "model", "os", "location", "contact", "billing_contact", + "use", "status", "status_change", "network", "address", "ace_type", + "ace_name", "admin_comment", "ops_comment", "created", "creator", + "inuse", "modtime", "modby", "modwith", }; -static struct validate ghst_validate = { - ghst_valobj, - 5, +static struct validate ghst_validate = { + 0, + 0, 0, 0, 0, @@ -793,234 +815,330 @@ static struct validate ghst_validate = { followup_ghst, }; +static char *ghha_fields[] = { + "name", + "hwaddr", +}; + +static char *ahst2_fields[] = { + "name", "vendor", "model", "os", "location", "contact", "use", + "status", "subnet", "address", "ace_type", "ace_name", + "admin_comment", "ops_comment", +}; + +static struct valobj ahst2_valobj[] = { + {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 ahst2_validate = { + ahst2_valobj, + 13, + "name", + "name = UPPER('%s')", + 1, + "mach_id", + access_host, + setup_ahst, + set_uppercase_modtime, +}; + static char *ahst_fields[] = { - NAME, "vendor", "model", "os", "location", "contact", "use", "status", SUBNET, ADDRESS, ACE_TYPE, ACE_NAME, "admin_comment", "ops_comment", + "name", "vendor", "model", "os", "location", "contact", "billing_contact", + "use", "status", "subnet", "address", "ace_type", "ace_name", + "admin_comment", "ops_comment", }; static struct valobj ahst_valobj[] = { - {V_CHAR, 0}, - {V_CHAR, 1}, - {V_CHAR, 2}, - {V_CHAR, 3}, - {V_CHAR, 4}, - {V_LOCK, 0, MACHINE, 0, MACH_ID, MR_DEADLOCK}, - {V_ID, 8, SUBNET, NAME, SNET_ID, MR_SUBNET}, - {V_TYPE, 10, ACE_TYPE, 0, 0, MR_ACE}, - {V_TYPEDATA, 11, 0, 0, 0, MR_ACE}, - {V_ID, 12, "strings", "string", "string_id", MR_NO_MATCH}, - {V_ID, 13, "strings", "string", "string_id", MR_NO_MATCH}, + {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_CHAR, 6, MACHINE_TABLE, "billing_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 ahst_validate = { ahst_valobj, - 11, - NAME, - "name = uppercase(LEFT('%s',SIZE(name)))", + 14, + "name", + "name = UPPER('%s')", 1, - MACH_ID, + "mach_id", access_host, setup_ahst, set_uppercase_modtime, }; +static char *uhst2_fields[] = { + "name", + "newname", "vendor", "model", "os", "location", "contact", "use", + "status", "subnet", "address", "ace_type", "ace_name", + "admin_comment", "ops_comment", +}; + +static struct valobj uhst2_valobj[] = { + {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 uhst2_validate = { + uhst2_valobj, + 15, + 0, + 0, + 0, + "mach_id", + access_host, + setup_ahst, + set_modtime_by_id, +}; + static char *uhst_fields[] = { - NAME, - "newname", "vendor", "model", "os", "location", "contact", "use", "status", SUBNET, ADDRESS, ACE_TYPE, ACE_NAME, "admin_comment", "ops_comment", + "name", + "newname", "vendor", "model", "os", "location", "contact", "billing_contact", + "use", "status", "subnet", "address", "ace_type", "ace_name", + "admin_comment", "ops_comment", }; static struct valobj uhst_valobj[] = { - {V_CHAR, 0}, - {V_ID, 0, MACHINE, NAME, MACH_ID, MR_MACHINE}, - {V_RENAME, 1, MACHINE, NAME, MACH_ID, MR_NOT_UNIQUE}, - {V_CHAR, 2}, - {V_CHAR, 3}, - {V_CHAR, 4}, - {V_CHAR, 5}, - {V_LOCK, 0, MACHINE, 0, MACH_ID, MR_DEADLOCK}, - {V_ID, 9, SUBNET, NAME, SNET_ID, MR_SUBNET}, - {V_TYPE, 11, ACE_TYPE, 0, 0, MR_ACE}, - {V_TYPEDATA, 12, 0, 0, 0, MR_ACE}, - {V_ID, 13, "strings", "string", "string_id", MR_NO_MATCH}, - {V_ID, 14, "strings", "string", "string_id", MR_NO_MATCH}, + {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_CHAR, 7, MACHINE_TABLE, "billing_contact"}, + {V_NUM, 8}, + {V_NUM, 9}, + {V_ID, 10, SUBNET_TABLE, "name", "snet_id", MR_SUBNET}, + {V_TYPE, 12, 0, "ace_type", 0, MR_ACE}, + {V_TYPEDATA, 13, 0, 0, 0, MR_ACE}, + {V_ID, 14, STRINGS_TABLE, "string", "string_id", MR_NO_MATCH}, + {V_ID, 15, STRINGS_TABLE, "string", "string_id", MR_NO_MATCH}, }; static struct validate uhst_validate = { uhst_valobj, - 13, + 16, 0, 0, 0, - MACH_ID, + "mach_id", access_host, setup_ahst, set_modtime_by_id, }; -static char *dhst_fields[] = { - NAME, +static char *uhha_fields[] = { + "name", + "hwaddr" }; -static struct valobj dhst_valobj[] = { - {V_LOCK, 0, MACHINE, 0, MACH_ID, MR_DEADLOCK}, - {V_ID, 0, MACHINE, NAME, MACH_ID, MR_MACHINE}, +static struct valobj uhha_valobj[] = { + {V_ID, 0, MACHINE_TABLE, "name", "mach_id", MR_MACHINE}, + {V_CHAR, 1, MACHINE_TABLE, "hwaddr"}, }; -static struct validate dhst_validate = { - dhst_valobj, +static struct validate uhha_validate = { + uhha_valobj, 2, 0, 0, 0, + "mach_id", 0, - 0, - setup_dmac, - 0, -}; - -static char *ghal_fields[] = { - ALIAS, "canonical_hostname", - ALIAS, "canonical_hostname" + setup_uhha, + set_modtime_by_id, }; -static struct valobj ghal_valobj[] = { - {V_UPWILD, 0}, - {V_UPWILD, 1}, - {V_SORT, 0}, +static char *dhst_fields[] = { + "name", }; -static struct validate ghal_validate = { - ghal_valobj, - 3, +static struct validate dhst_validate = { + VOmach0, + 1, 0, 0, 0, 0, + 0, + setup_dmac, + 0, +}; + +static char *ghal_fields[] = { + "alias", "canonical_hostname", + "alias", "canonical_hostname" +}; + +static struct validate ghal_validate = { 0, 0, 0, + 0, + 0, + 0, + access_ahal, + 0, + 0, }; static struct valobj ahal_valobj[] = { - {V_CHAR, 0}, - {V_UPWILD, 0}, - {V_ID, 1, MACHINE, NAME, MACH_ID, MR_MACHINE}, + {V_CHAR, 0, HOSTALIAS_TABLE, "name"}, + {V_ID, 1, MACHINE_TABLE, "name", "mach_id", MR_MACHINE}, }; static struct validate ahal_validate = { ahal_valobj, - 3, - NAME, - "name = LEFT('%s',SIZE(name))", + 2, + "name", + "name = UPPER('%s')", 1, - MACH_ID, + "mach_id", access_ahal, setup_ahal, 0, }; static struct valobj dhal_valobj[] = { - {V_UPWILD, 0}, - {V_LOCK, 0, MACHINE, 0, MACH_ID, MR_DEADLOCK}, - {V_ID, 1, MACHINE, NAME, MACH_ID, MR_MACHINE}, + {V_ID, 1, MACHINE_TABLE, "name", "mach_id", MR_MACHINE}, }; static struct validate dhal_validate = { dhal_valobj, - 3, - NAME, - "name = LEFT('%s',SIZE(name)) AND mach_id = %d", + 1, + "name", + "name = UPPER('%s') AND mach_id = %d", 2, - MACH_ID, + "mach_id", access_ahal, 0, 0, }; static char *gsnt_fields[] = { - NAME, - NAME, DESC, ADDRESS, "mask", "low", "high", ACE_TYPE, ACE_NAME, - MOD1, MOD2, MOD3 -}; - -static struct valobj gsnt_valobj[] = { - {V_UPWILD, 0}, - {V_SORT, 0}, + "name", + "name", "description", "address", "mask", "low", "high", "prefix", + "ace_type", "ace_name", "modtime", "modby", "modwith" }; static struct validate gsnt_validate = { - gsnt_valobj, - 2, 0, 0, 0, 0, 0, 0, + access_snt, + 0, followup_gsnt, }; static char *asnt_fields[] = { - NAME, DESC, ADDRESS, "mask", "low", "high", ACE_TYPE, ACE_NAME, + "name", "description", "address", "mask", "low", "high", "prefix", + "ace_type", "ace_name", }; static struct valobj asnt_valobj[] = { - {V_LOCK, 0, SUBNET, 0, SNET_ID, MR_DEADLOCK}, - {V_CHAR, 0}, - {V_TYPE, 6, ACE_TYPE, 0, 0, MR_ACE}, - {V_TYPEDATA, 7, 0, 0, 0, MR_ACE}, + {V_CHAR, 0, SUBNET_TABLE, "name"}, + {V_LEN, 1, SUBNET_TABLE, "description"}, + {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 = +static struct validate asnt_validate = { - asnt_valobj, - 4, - NAME, - "name = uppercase(LEFT('%s',SIZE(name))) OR description = '__'+'%s' OR saddr = '%s'", - 3, - SNET_ID, - 0, - prefetch_value, - set_uppercase_modtime, + asnt_valobj, + 9, + "name", + "name = UPPER('%s')", + 1, + "snet_id", + 0, + prefetch_value, + set_uppercase_modtime, }; static char *usnt_fields[] = { - NAME, - "newname", DESC, ADDRESS, "mask", "low", "high", ACE_TYPE, ACE_NAME, + "name", + "newname", "description", "address", "mask", "low", "high", "prefix", + "ace_type", "ace_name", }; static struct valobj usnt_valobj[] = { - {V_LOCK, 0, SUBNET, 0, SNET_ID, MR_DEADLOCK}, - {V_ID, 0, SUBNET, NAME, SNET_ID, MR_NO_MATCH}, - {V_RENAME, 1, SUBNET, NAME, SNET_ID, MR_NOT_UNIQUE}, - {V_TYPE, 7, ACE_TYPE, 0, 0, MR_ACE}, - {V_TYPEDATA, 8, 0, 0, 0, MR_ACE}, -}; - -static struct validate usnt_validate = + {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, "description"}, + {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, - 5, - NAME, - "snet_id = %d OR description = '__'+'%s' OR description = '__'+'%s' OR saddr = '%s'", - 4, - SNET_ID, - 0, - 0, - set_modtime_by_id, + usnt_valobj, + 10, + "name", + "snet_id = %d", + 1, + "snet_id", + 0, + 0, + set_modtime_by_id, }; static char *dsnt_fields[] = { - NAME, -}; - -static struct valobj dsnt_valobj[] = { - {V_LOCK, 0, SUBNET, 0, SNET_ID, MR_DEADLOCK}, - {V_ID, 0, SUBNET, NAME, SNET_ID, MR_SUBNET}, + "name", }; static struct validate dsnt_validate = { - dsnt_valobj, - 2, + VOsnet0, + 1, 0, 0, 0, @@ -1031,57 +1149,59 @@ static struct validate dsnt_validate = { }; static char *gclu_fields[] = { - NAME, - NAME, DESC, LOCATION, MOD1, MOD2, MOD3, + "name", + "name", "description", "location", "modtime", "modby", "modwith", }; static char *aclu_fields[] = { - NAME, DESC, LOCATION, + "name", "description", "location", }; static struct valobj aclu_valobj[] = { - {V_LOCK, 0, CLUSTER, 0, CLU_ID, MR_DEADLOCK}, - {V_CHAR, 0} + {V_CHAR, 0, CLUSTERS_TABLE, "name"}, + {V_LEN, 1, CLUSTERS_TABLE, "description"}, + {V_LEN, 2, CLUSTERS_TABLE, "location"}, }; -static struct validate aclu_validate = +static struct validate aclu_validate = { aclu_valobj, - 2, - NAME, - "name = LEFT('%s',SIZE(name))", + 3, + "name", + "name = '%s'", 1, - CLU_ID, + "clu_id", 0, prefetch_value, set_modtime, }; static char *uclu_fields[] = { - NAME, - "newname", DESC, LOCATION, + "name", + "newname", "description", "location", }; 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}, + {V_ID, 0, CLUSTERS_TABLE, "name", "clu_id", MR_CLUSTER}, + {V_RENAME, 1, CLUSTERS_TABLE, "name", "clu_id", MR_NOT_UNIQUE}, + {V_LEN, 2, CLUSTERS_TABLE, "description"}, + {V_LEN, 3, CLUSTERS_TABLE, "location"}, }; static struct validate uclu_validate = { uclu_valobj, - 3, + 4, 0, 0, 0, - CLU_ID, + "clu_id", 0, 0, set_modtime_by_id, }; static char *dclu_fields[] = { - NAME, + "name", }; static struct validate dclu_validate = { @@ -1097,31 +1217,21 @@ static struct validate dclu_validate = { }; static char *gmcm_fields[] = { - MACHINE, CLUSTER, - MACHINE, CLUSTER, + "machine", "cluster", + "machine", "cluster", }; -static struct valobj gmcm_valobj[] = -{ - {V_UPWILD, 0}, - {V_WILD, 1}, - {V_SORT, 0}, - {V_SORT, 1}, -}; - -static struct validate gmcm_validate = { gmcm_valobj, 4 }; - 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, CLUSTERS_TABLE, "name", "clu_id", MR_CLUSTER}, }; static struct validate amtc_validate = /* for amtc and dmfc */ { amtc_valobj, 2, - MACH_ID, + "mach_id", "mach_id = %d and clu_id = %d", 2, 0, @@ -1131,27 +1241,27 @@ static struct validate amtc_validate = /* for amtc and dmfc */ }; static char *gcld_fields[] = { - CLUSTER, "serv_label", - CLUSTER, "serv_label", "serv_cluster", + "cluster", "serv_label", + "cluster", "serv_label", "serv_cluster", }; static char *acld_fields[] = { - CLUSTER, "serv_label", "serv_cluster", + "cluster", "serv_label", "serv_cluster", }; static struct valobj acld_valobj[] = { - {V_ID, 0, CLUSTER, NAME, CLU_ID, MR_CLUSTER}, - {V_CHAR, 1}, - {V_CHAR, 2}, + {V_ID, 0, CLUSTERS_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 = -{ +static struct validate acld_validate = +{ acld_valobj, 3, - CLU_ID, - "clu_id = %d AND serv_label = '%s' AND serv_cluster = LEFT('%s',SIZE(serv_cluster))", + "clu_id", + "clu_id = %d AND serv_label = '%s' AND serv_cluster = '%s'", 3, 0, 0, @@ -1159,17 +1269,11 @@ static struct validate acld_validate = set_cluster_modtime_by_id, }; -static struct valobj dcld_valobj[] = +static struct validate dcld_validate = { - {V_ID, 0, CLUSTER, NAME, CLU_ID, MR_CLUSTER}, - {V_CHAR, 2}, -}; - -static struct validate dcld_validate = -{ - dcld_valobj, - 2, - CLU_ID, + VOclu0, + 1, + "clu_id", "clu_id = %d AND serv_label = '%s' AND serv_cluster = '%s'", 3, 0, @@ -1178,1007 +1282,1242 @@ static struct validate dcld_validate = set_cluster_modtime_by_id, }; -static char *gsin_fields[] = { - SERVICE, - SERVICE, "update_int", "target_file", "script", "dfgen", "dfcheck", - TYPE, "enable", "inprogress", "harderror", "errmsg", - ACE_TYPE, ACE_NAME, MOD1, MOD2, MOD3, +static char *glin2_fields[] = { + "name", + "name", "active", "publicflg", "hidden", "maillist", "grouplist", "gid", + "ace_type", "ace_name", "description", "modtime", "modby", "modwith", }; -static struct valobj gsin_valobj[] = -{ - { V_UPWILD, 0 }, +static char *glin3_fields[] = { + "name", + "name", "active", "publicflg", "hidden", "maillist", "grouplist", "gid", + "nfsgroup", "ace_type", "ace_name", "description", "modtime", "modby", + "modwith", }; -static struct validate gsin_validate = -{ - gsin_valobj, - 1, +static char *glin_fields[] = { + "name", + "name", "active", "publicflg", "hidden", "maillist", "grouplist", "gid", + "nfsgroup", "ace_type", "ace_name", "memace_type", "memace_name", + "description", "modtime", "modby", "modwith", +}; + +static struct validate glin_validate = { 0, 0, 0, 0, - access_service, + 0, + 0, + access_vis_list_by_name, 0, followup_glin, }; -static char *qgsv_fields[] = { - "enable", "inprogress", "harderror", - "service", +static char *alis2_fields[] = { + "name", "active", "publicflg", "hidden", "maillist", "grouplist", "gid", + "ace_type", "ace_name", "description", }; -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}, +static struct valobj alis2_valobj[] = { + {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, "description"}, }; -static struct validate qgsv_validate = { - qgsv_valobj, - 3, - 0, - 0, - 0, - 0, - 0, +static struct validate alis2_validate = { + alis2_valobj, + 10, + "name", + "name = '%s'", + 1, + "list_id", 0, - qualified_get_server, + setup_alis, + set_modtime, }; -static char *asin_fields[] = { - SERVICE, "update_int", "target_file", "script", TYPE, "enable", - ACE_TYPE, ACE_NAME, +static char *alis3_fields[] = { + "name", "active", "publicflg", "hidden", "maillist", "grouplist", "gid", + "nfsgroup", "ace_type", "ace_name", "description", }; -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_TYPEDATA, 7, 0, 0, 0, MR_ACE}, +static struct valobj alis3_valobj[] = { + {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_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, "description"}, }; -static struct validate asin_validate = /* for asin, usin */ -{ - asin_valobj, - 5, - NAME, - "name = uppercase(LEFT('%s',SIZE(name)))", +static struct validate alis3_validate = { + alis3_valobj, + 11, + "name", + "name = '%s'", 1, + "list_id", 0, - 0, - 0, - set_uppercase_modtime, + setup_alis, + set_modtime, }; -static struct validate rsve_validate = { - asin_valobj, - 1, - NAME, - "name = uppercase('%s')", - 1, - 0, - access_service, - 0, - set_uppercase_modtime, +static char *alis_fields[] = { + "name", "active", "publicflg", "hidden", "maillist", "grouplist", "gid", + "nfsgroup", "ace_type", "ace_name", "memace_type", "memace_name", + "description", }; -static char *ssif_fields[] = { - SERVICE, "dfgen", "dfcheck", "inprogress", "harderror", "errmsg", +static struct valobj alis_valobj[] = { + {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_NUM, 7}, + {V_TYPE, 8, 0, "ace_type", 0, MR_ACE}, + {V_TYPEDATA, 9, 0, 0, "list_id", MR_ACE}, + {V_TYPE, 10, 0, "ace_type", 0, MR_ACE}, + {V_TYPEDATA, 11, 0, 0, "list_id", MR_ACE}, + {V_LEN, 12, LIST_TABLE, "description"}, }; -static struct validate ssif_validate = { - asin_valobj, - 1, - NAME, - "name = uppercase('%s')", +static struct validate alis_validate = { + alis_valobj, + 13, + "name", + "name = '%s'", 1, + "list_id", 0, - 0, - 0, - 0, -}; - -static char *dsin_fields[] = { - SERVICE, + setup_alis, + set_modtime, }; -static struct validate dsin_validate = { - asin_valobj, - 1, - NAME, - "name = uppercase('%s')", - 1, - 0, - 0, - setup_dsin, - 0, +static char *ulis2_fields[] = { + "name", + "newname", "active", "publicflg", "hidden", "maillist", "grouplist", "gid", + "ace_type", "ace_name", "description", }; -static char *gshi_fields[] = { - SERVICE, MACHINE, - SERVICE, MACHINE, "enable", "override", "success", "inprogress", - "hosterror", "hosterrormsg", "ltt", "lts", "value1", "value2", - "value3", MOD1, MOD2, MOD3, +static struct valobj ulis2_valobj[] = { + {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, "description"}, }; -static struct valobj gshi_valobj[] = { - { V_UPWILD, 0 }, - { V_UPWILD, 1 }, +static struct validate ulis2_validate = { + ulis2_valobj, + 11, + "name", + "list_id = %d", + 1, + "list_id", + access_list, + setup_alis, + set_modtime_by_id, }; -static struct validate gshi_validate = { - gshi_valobj, - 2, - 0, - 0, - 0, - 0, - access_service, - 0, - followup_fix_modby, +static char *ulis3_fields[] = { + "name", + "newname", "active", "publicflg", "hidden", "maillist", "grouplist", "gid", + "nfsgroup", "ace_type", "ace_name", "description", }; -static char *qgsh_fields[] = { - "service", "enable", "override", "success", "inprogress", "hosterror", - "service", MACHINE, +static struct valobj ulis3_valobj[] = { + {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_NUM, 8}, + {V_TYPE, 9, 0, "ace_type", 0, MR_ACE}, + {V_TYPEDATA, 10, 0, 0, "list_id", MR_ACE}, + {V_LEN, 11, LIST_TABLE, "description"}, }; -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}, +static struct validate ulis3_validate = { + ulis3_valobj, + 12, + "name", + "list_id = %d", + 1, + "list_id", + access_list, + setup_alis, + set_modtime_by_id, }; -static struct validate qgsh_validate = { - qgsh_valobj, - 5, - 0, - 0, - 0, - 0, - 0, - 0, - qualified_get_serverhost, +static char *ulis_fields[] = { + "name", + "newname", "active", "publicflg", "hidden", "maillist", "grouplist", "gid", + "nfsgroup", "ace_type", "ace_name", "memace_type", "memace_name", + "description", }; -static char *ashi_fields[] = { - SERVICE, MACHINE, "enable", "value1", "value2", "value3", +static struct valobj ulis_valobj[] = { + {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_NUM, 8}, + {V_TYPE, 9, 0, "ace_type", 0, MR_ACE}, + {V_TYPEDATA, 10, 0, 0, "list_id", MR_ACE}, + {V_TYPE, 11, 0, "ace_type", 0, MR_ACE}, + {V_TYPEDATA, 12, 0, 0, "list_id", MR_ACE}, + {V_LEN, 13, LIST_TABLE, "description"}, }; -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}, +static struct validate ulis_validate = { + ulis_valobj, + 14, + "name", + "list_id = %d", + 1, + "list_id", + access_list, + setup_alis, + set_modtime_by_id, }; -static struct validate ashi_validate = /* ashi & ushi */ -{ - ashi_valobj, - 3, - SERVICE, - "service = uppercase(LEFT('%s',SIZE(service))) AND mach_id = %d", - 2, - 0, - access_service, - 0, - set_serverhost_modtime, +static char *dlis_fields[] = { + "name", }; -static struct validate rshe_validate = -{ - ashi_valobj, - 3, - SERVICE, - "service = uppercase('%s') AND mach_id = %d", - 2, +static struct validate dlis_validate = { + VOlist0, + 1, + "name", + "list_id = %d", + 1, 0, - access_service, + access_list, + setup_dlis, 0, - set_serverhost_modtime, }; -static struct validate ssho_validate = -{ - ashi_valobj, - 3, - SERVICE, - "service = uppercase('%s') AND mach_id = %d", - 2, - 0, - access_service, - 0, - trigger_dcm, +static char *amtl_fields[] = { + "list_name", "member_type", "member_name", }; -static char *sshi_fields[] = { - "service", MACHINE, "override", "success", "inprogress", - "hosterror", "errmsg", "ltt", "lts", +static char *atml_fields[] = { + "list_name", "member_type", "member_name", "tag", }; -static struct valobj sshi_valobj[] = { - {V_NAME, 0, "servers", NAME, 0, MR_SERVICE}, - {V_ID, 1, MACHINE, NAME, MACH_ID, MR_MACHINE}, /** Was this ok to add? */ +static struct valobj amtl_valobj[] = { + {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}, + {V_ID, 3, STRINGS_TABLE, "string", "string_id", MR_NO_MATCH}, }; -static struct validate sshi_validate = +static struct validate amtl_validate = { - sshi_valobj, - 2, - 0, + amtl_valobj, + 3, 0, 0, 0, 0, - setup_sshi, + access_list, 0, + add_member_to_list, }; -static char *dshi_fields[] = { - SERVICE, MACHINE, -}; - -static struct validate dshi_validate = +static struct validate atml_validate = { - ashi_valobj, - 3, - SERVICE, - "service = uppercase('%s') AND mach_id = %d", - 2, + amtl_valobj, + 4, 0, - access_service, - setup_dshi, 0, + 0, + 0, + access_list, + 0, + add_member_to_list, }; -static char *gsha_fields[] = { - MACHINE, - MACHINE, ACE_TYPE, ACE_NAME, MOD1, MOD2, MOD3, -}; - -static struct validate gsha_validate = +static struct validate tmol_validate = { - VOupwild0, - 1, + amtl_valobj, + 4, 0, 0, 0, 0, + access_list, 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}, + tag_member_of_list, }; -static struct validate asha_validate = +static struct validate dmfl_validate = { - asha_valobj, + amtl_valobj, 3, - MACH_ID, - "mach_id = %d", - 1, - MACH_ID, 0, 0, - set_modtime_by_id, -}; - -static char *gslo_fields[] = { - "server", - "server", MACHINE, + 0, + 0, + access_list, + 0, + delete_member_from_list, }; -static char *gfsl_fields[] = { - LABEL, - LABEL, TYPE, MACHINE, NAME, "mount", "access", COMMENTS, "owner", "owners", - "create", "lockertype", MOD1, MOD2, MOD3, +static char *gaus_fields[] = { + "ace_type", "ace_name", + "use_type", "use_name", }; -static char *gfsm_fields[] = { - MACHINE, - LABEL, TYPE, MACHINE, NAME, "mount", "access", COMMENTS, "owner", "owners", - "create", "lockertype", MOD1, MOD2, MOD3, +static struct valobj gaus_valobj[] = { + {V_TYPE, 0, 0, "gaus", 0, MR_TYPE}, + {V_TYPEDATA, 1, 0, 0, 0, MR_NO_MATCH}, }; -static struct validate gfsm_validate = { - VOmach0, - 1, - 0, +static struct validate gaus_validate = { + gaus_valobj, + 2, 0, 0, 0, 0, + access_member, 0, - followup_fix_modby, + get_ace_use, }; -static char *gfsn_fields[] = { - MACHINE, "parition", - LABEL, TYPE, MACHINE, NAME, "mount", "access", COMMENTS, "owner", "owners", - "create", "lockertype", MOD1, MOD2, MOD3, +static char *ghbo_fields[] = { + "ace_type", "ace_name", + "name", }; -static struct valobj gfsn_valobj[] = -{ - {V_ID, 0, MACHINE, NAME, MACH_ID, MR_MACHINE}, - {V_WILD, 1}, +static struct valobj ghbo_valobj[] = { + {V_TYPE, 0, 0, "gaus", 0, MR_TYPE}, + {V_TYPEDATA, 1, 0, 0, 0, MR_NO_MATCH}, }; -static struct validate gfsn_validate = { - gfsn_valobj, +static struct validate ghbo_validate = { + ghbo_valobj, 2, 0, 0, 0, 0, + access_member, 0, - 0, - followup_fix_modby, + get_host_by_owner, }; -static char *gfsp_fields[] = { - "path", - LABEL, TYPE, MACHINE, NAME, "mount", "access", COMMENTS, "owner", "owners", - "create", "lockertype", MOD1, MOD2, MOD3, +static char *qgli_fields[] = { + "active", "publicflg", "hidden", "maillist", "grouplist", + "list", }; -static char *gfsg_fields[] = { - LIST, - LABEL, TYPE, MACHINE, NAME, "mount", "access", COMMENTS, "owner", "owners", - "create", "lockertype", MOD1, MOD2, MOD3, +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 gfsg_validate = { - VOlist0, - 1, +static struct validate qgli_validate = { + qgli_valobj, + 5, 0, 0, 0, 0, - access_list, + access_qgli, 0, - followup_fix_modby, + qualified_get_lists, }; -static char *afil_fields[] = { - LABEL, TYPE, MACHINE, NAME, "mount", "access", COMMENTS, "owner", "owners", - "create", "lockertype", +static char *gmol_fields[] = { + "list_name", + "member_type", "member_name", }; -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} +static char *gtml_fields[] = { + "list_name", + "member_type", "member_name", "tag", }; -static struct validate afil_validate = { - afil_valobj, - 8, - LABEL, - "label = LEFT('%s',SIZE(label))", +static struct validate gmol_validate = { + VOlist0, 1, - FILSYS_ID, 0, - setup_afil, - set_filesys_modtime, + 0, + 0, + 0, + access_visible_list, + 0, + get_members_of_list, }; -static char *ufil_fields[] = { - LABEL, "newlabel", TYPE, MACHINE, NAME, "mount", "access", COMMENTS, - "owner", "owners", "create", "lockertype", +static char *glom_fields[] = { + "member_type", "member_name", + "list_name", "active", "publicflg", "hidden", "maillist", "grouplist", }; -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} +static struct valobj glom_valobj[] = { + {V_TYPE, 0, 0, "rmember", 0, MR_TYPE}, + {V_TYPEDATA, 1, 0, 0, 0, MR_NO_MATCH}, }; -static struct validate ufil_validate = { - ufil_valobj, - 9, - LABEL, - "filsys_id = %d", - 1, - FILSYS_ID, +static struct validate glom_validate = { + glom_valobj, + 2, 0, - setup_ufil, - set_filesys_modtime, -}; - -static char *dfil_fields[] = { - LABEL, + 0, + 0, + 0, + access_member, + 0, + get_lists_of_member, }; -static struct valobj dfil_valobj[] = { - {V_LOCK, 0, FILESYS, 0, FILSYS_ID, MR_DEADLOCK}, - {V_ID, 0, FILESYS, LABEL, FILSYS_ID, MR_FILESYS}, +static char *cmol_fields[] = { + "list_name", + "count", }; -static struct validate dfil_validate = { - dfil_valobj, - 2, - "label", - "filsys_id = %d", +static struct validate cmol_validate = { + VOlist0, 1, 0, 0, - setup_dfil, 0, + 0, + access_visible_list, + 0, + count_members_of_list, }; -static char *gfgm_fields[] = { - "fsgroup", FILESYS, "sortkey" - }; - -static struct valobj gfgm_valobj[] = { - {V_ID, 0, FILESYS, LABEL, FILSYS_ID, MR_FILESYS}, - {V_SORT, 1}, - {V_SORT, 0}, +static char *gsin_fields[] = { + "service", + "service", "update_int", "target_file", "script", "dfgen", "dfcheck", + "type", "enable", "inprogress", "harderror", "errmsg", + "ace_type", "ace_name", "modtime", "modby", "modwith", }; -static struct validate gfgm_validate = { - gfgm_valobj, - 3, +static struct validate gsin_validate = +{ 0, 0, 0, 0, 0, 0, + access_service, 0, + followup_gsin, }; -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}, +static char *qgsv_fields[] = { + "enable", "inprogress", "harderror", + "service", }; -static struct validate aftg_validate = { - aftg_valobj, +static struct valobj qgsv_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}, +}; + +static struct validate qgsv_validate = { + qgsv_valobj, 3, - "group_id", - "group_id = %d and filsys_id = %d", - 2, 0, 0, 0, 0, + 0, + 0, + qualified_get_server, }; -static char *ganf_fields[] = { - MACHINE, DIR, DEVICE, STATUS, "allocated", "size", MOD1, MOD2, MOD3, -}; - -static char *gnfp_fields[] = { - MACHINE, DIR, - MACHINE, DIR, DEVICE, STATUS, "allocated", "size", MOD1, MOD2, MOD3, +static char *asin_fields[] = { + "service", "update_int", "target_file", "script", "type", "enable", + "ace_type", "ace_name", }; -static struct valobj gnfp_valobj[] = { - {V_ID, 0, MACHINE, NAME, MACH_ID, MR_MACHINE}, - {V_WILD, 1}, +static struct valobj asin_valobj[] = { + {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 gnfp_validate = { - gnfp_valobj, - 2, - 0, +static struct validate asin_validate = /* for asin, usin */ +{ + asin_valobj, + 8, + "name", + "name = UPPER('%s')", + 1, 0, 0, 0, + set_uppercase_modtime, +}; + +static struct validate rsve_validate = { + asin_valobj, + 1, + "name", + "name = UPPER('%s')", + 1, 0, + access_service, 0, - followup_fix_modby, + set_uppercase_modtime, }; -static struct valobj anfp_valobj[] = { - {V_ID, 0, MACHINE, NAME, MACH_ID, MR_MACHINE}, - {V_CHAR, 1}, +static char *ssif_fields[] = { + "service", "dfgen", "dfcheck", "inprogress", "harderror", "errmsg", }; -static struct validate anfp_validate = { - anfp_valobj, - 2, - DIR, - "mach_id = %d and dir = LEFT('%s',SIZE(dir))", - 2, - "nfsphys_id", - 0, - prefetch_value, - set_nfsphys_modtime, +static struct valobj ssif_valobj[] = { + {V_NAME, 0, SERVERS_TABLE, "name", 0, MR_SERVICE}, + {V_NUM, 1}, + {V_NUM, 2}, + {V_NUM, 3}, + {V_NUM, 4}, + {V_LEN, 5, SERVERS_TABLE, "errmsg"}, }; -static struct validate unfp_validate = { - anfp_valobj, - 2, - DIR, - "mach_id = %d and dir = '%s'", - 2, - "nfsphys_id", +static struct validate ssif_validate = { + ssif_valobj, + 6, + "name", + "name = UPPER('%s')", + 1, + 0, + 0, 0, 0, - set_nfsphys_modtime, -}; - -static char *ajnf_fields[] = { - MACHINE, DIR, "adjustment", }; -static char *dnfp_fields[] = { - MACHINE, DIR, +static char *dsin_fields[] = { + "service", }; -static struct validate dnfp_validate = { - VOmach0, +static struct validate dsin_validate = { + asin_valobj, + 1, + "name", + "name = UPPER('%s')", 1, - DIR, - "mach_id = %d and dir = '%s'", - 2, - "nfsphys_id", 0, - setup_dnfp, - set_nfsphys_modtime, -}; - -static char *gqot_fields[] = { - FILESYS, TYPE, NAME, - FILESYS, TYPE, NAME, QUOTA, DIR, MACHINE, MOD1, MOD2, MOD3, + 0, + setup_dsin, + 0, }; -static struct valobj gqot_valobj[] = { - {V_WILD, 0}, - {V_TYPE, 1, QUOTA_TYPE, 0, 0, MR_TYPE}, - {V_TYPEDATA, 2, 0, 0, 0, MR_ACE}, - {V_SORT, 0, 0, 0, 0, 0}, +static char *gshi_fields[] = { + "service", "machine", + "service", "machine", "enable", "override", "success", "inprogress", + "hosterror", "hosterrormsg", "ltt", "lts", "value1", "value2", + "value3", "modtime", "modby", "modwith", }; -static struct validate gqot_validate = { - gqot_valobj, - 4, +static struct validate gshi_validate = { 0, 0, 0, 0, 0, 0, - followup_gqot, + access_service, + 0, + followup_fix_modby, }; -static char *gqbf_fields[] = { - FILESYS, - FILESYS, TYPE, NAME, QUOTA, DIR, MACHINE, MOD1, MOD2, MOD3, +static char *qgsh_fields[] = { + "service", "enable", "override", "success", "inprogress", "hosterror", + "service", "machine", }; -static struct validate gqbf_validate = { - VOwild0sort, - 2, +static struct valobj qgsh_valobj[] = { + {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, - access_filesys, 0, - followup_gqot, + 0, + qualified_get_serverhost, }; -static char *aqot_fields[] = { - FILESYS, TYPE, NAME, QUOTA, +static char *ashi_fields[] = { + "service", "machine", "enable", "value1", "value2", "value3", }; -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_TYPEDATA, 2, 0, 0, 0, MR_ACE}, +static struct valobj ashi_valobj[] = { + {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_LEN, 5, SERVERHOSTS_TABLE, "value3"}, }; -static struct validate aqot_validate = { - aqot_valobj, - 4, - FILSYS_ID, - "filsys_id = %d and type = '%s' and entity_id = %d", - 3, - 0, - 0, - prefetch_filesys, - followup_aqot, +static struct validate ashi_validate = /* ashi & ushi */ +{ + ashi_valobj, + 6, + "service", + "service = UPPER('%s') AND mach_id = %d", + 2, + 0, + access_service, + 0, + set_serverhost_modtime, }; -static struct validate uqot_validate = { - aqot_valobj, - 4, - FILSYS_ID, - "filsys_id = %d AND type = '%s' AND entity_id = %d", - 3, +static struct validate rshe_validate = +{ + ashi_valobj, + 2, + "service", + "service = UPPER('%s') AND mach_id = %d", + 2, 0, + access_service, 0, - setup_dqot, - followup_aqot, + set_serverhost_modtime, }; -static struct validate dqot_validate = { - aqot_valobj, - 4, - FILSYS_ID, - "filsys_id = %d AND type = '%s' AND entity_id = %d", - 3, +static struct validate ssho_validate = +{ + ashi_valobj, + 2, + "service", + "service = UPPER('%s') AND mach_id = %d", + 2, 0, + access_service, 0, - setup_dqot, - followup_dqot, + trigger_dcm, }; -static char *gnfq_fields[] = { - FILESYS, LOGIN, - FILESYS, LOGIN, QUOTA, DIR, MACHINE, MOD1, MOD2, MOD3, +static char *sshi_fields[] = { + "service", "machine", "override", "success", "inprogress", + "hosterror", "errmsg", "ltt", "lts", }; -static struct validate gnfq_validate = { - VOwild0sort, - 2, +static struct valobj sshi_valobj[] = { + {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, SERVERHOSTS_TABLE, "hosterrmsg"}, + {V_NUM, 7}, + {V_NUM, 8}, +}; + +static struct validate sshi_validate = +{ + sshi_valobj, + 9, + 0, + 0, 0, 0, 0, 0, - access_filesys, 0, - followup_gqot, }; -static char *gnqp_fields[] = { - MACHINE, DIR, - FILESYS, LOGIN, QUOTA, DIR, MACHINE, MOD1, MOD2, MOD3, +static char *dshi_fields[] = { + "service", "machine", }; -static struct valobj gnqp_valobj[] = { - {V_ID, 0, MACHINE, NAME, MACH_ID, MR_MACHINE}, - {V_WILD, 1}, +static struct validate dshi_validate = +{ + ashi_valobj, + 2, + "service", + "service = UPPER('%s') AND mach_id = %d", + 2, + 0, + access_service, + setup_dshi, + 0, }; -static struct validate gnqp_validate = { gnqp_valobj, 2, }; - -static char *anfq_fields[] = { - FILESYS, LOGIN, QUOTA, +static char *gslo_fields[] = { + "server", + "server", "machine", }; -static struct validate anfq_validate = { - VOfilsys0user1, - 3, - FILSYS_ID, - "filsys_id = %d AND type = 'USER' AND entity_id = %d", - 2, - 0, /* object ? */ - 0, - prefetch_filesys, - followup_aqot, +static char *gfsl_fields[] = { + "label", + "label", "type", "machine", "name", "mount", "access", "comments", + "owner", "owners", "create", "lockertype", "modtime", "modby", "modwith", }; -static struct validate unfq_validate = { - VOfilsys0user1, - 3, - FILSYS_ID, - "filsys_id = %d AND type = 'USER' AND entity_id = %d", - 2, +static struct validate gfsl_validate = { 0, 0, - setup_dqot, - followup_aqot, -}; - -static struct validate dnfq_validate = { - VOfilsys0user1, - 3, - FILSYS_ID, - "filsys_id = %d AND entity_id = %d", - 2, 0, 0, - setup_dqot, - followup_dqot, + 0, + 0, + access_filesys, + 0, + followup_fix_modby, }; -static char *glin_fields[] = { - NAME, - NAME, "active", "publicflg", "hidden", "maillist", "grouplist", "gid", - ACE_TYPE, ACE_NAME, DESC, MOD1, MOD2, MOD3, +static char *gfsm_fields[] = { + "machine", + "label", "type", "machine", "name", "mount", "access", "comments", + "owner", "owners", "create", "lockertype", "modtime", "modby", "modwith", }; -static struct validate glin_validate = { - 0, +static struct validate gfsm_validate = { + VOmach0, + 1, 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, + followup_fix_modby, }; -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 char *gfsn_fields[] = { + "machine", "partition", + "label", "type", "machine", "name", "mount", "access", "comments", + "owner", "owners", "create", "lockertype", "modtime", "modby", "modwith", }; -static struct validate alis_validate = { - alis_valobj, - 4, - NAME, - "name = LEFT('%s',SIZE(name))", +static struct validate gfsn_validate = { + VOmach0, 1, - LIST_ID, 0, - setup_alis, - set_modtime, + 0, + 0, + 0, + 0, + 0, + followup_fix_modby, }; -static char *ulis_fields[] = { - NAME, - "newname", "active", "publicflg", "hidden", "maillist", "grouplist", "gid", - ACE_TYPE, ACE_NAME, DESC, +static char *gfsp_fields[] = { + "path", + "label", "type", "machine", "name", "mount", "access", "comments", + "owner", "owners", "create", "lockertype", "modtime", "modby", "modwith", }; -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 char *gfsg_fields[] = { + "list", + "label", "type", "machine", "name", "mount", "access", "comments", + "owner", "owners", "create", "lockertype", "modtime", "modby", "modwith", }; -static struct validate ulis_validate = { - ulis_valobj, - 5, - NAME, - "list_id = %d", +static struct validate gfsg_validate = { + VOlist0, 1, - LIST_ID, + 0, + 0, + 0, + 0, access_list, - setup_alis, - set_modtime_by_id, + 0, + followup_fix_modby, }; -static char *dlis_fields[] = { - NAME, +static char *afil_fields[] = { + "label", "type", "machine", "name", "mount", "access", "comments", + "owner", "owners", "create", "lockertype", }; -static struct validate dlis_validate = { - VOlist0, - 1, - NAME, - "list_id = %d", +static struct valobj afil_valobj[] = { + {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, + 11, + "label", + "label = '%s'", 1, + "filsys_id", 0, - access_list, - setup_dlis, - 0, + setup_afil, + set_filesys_modtime, }; -static char *amtl_fields[] = { - "list_name", "member_type", "member_name", +static char *ufil_fields[] = { + "label", "newlabel", "type", "machine", "name", "mount", "access", + "comments", "owner", "owners", "create", "lockertype", }; -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 valobj ufil_valobj[] = { + {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 amtl_validate = -{ - amtl_valobj, - 4, - 0, +static struct validate ufil_validate = { + ufil_valobj, + 12, + "label", + "filsys_id = %d", + 1, + "filsys_id", 0, + setup_ufil, + set_filesys_modtime, +}; + +static char *dfil_fields[] = { + "label", +}; + +static struct validate dfil_validate = { + VOfilesys0, + 1, + "label", + "filsys_id = %d", + 1, 0, 0, - access_list, + setup_dfil, 0, - add_member_to_list, }; -static struct validate dmfl_validate = -{ - amtl_valobj, - 4, +static char *gfgm_fields[] = { + "fsgroup", "filesys", "sortkey" +}; + +static struct validate gfgm_validate = { + VOfilesys0, + 1, + 0, + 0, 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 valobj aftg_valobj[] = { + {V_ID, 0, FILESYS_TABLE, "label", "filsys_id", MR_FILESYS}, + {V_ID, 1, FILESYS_TABLE, "label", "filsys_id", MR_FILESYS}, }; -static struct validate gaus_validate = { - gaus_valobj, +static struct validate aftg_validate = { + aftg_valobj, + 2, + "group_id", + "group_id = %d and filsys_id = %d", 2, 0, 0, 0, 0, - access_member, - 0, - get_ace_use, }; -static char *qgli_fields[] = { - "active", "publicflg", "hidden", "maillist", "grouplist", - "list", +static char *ganf_fields[] = { + "machine", "dir", "device", "status", "allocated", "size", + "modtime", "modby", "modwith", }; -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 char *gnfp_fields[] = { + "machine", "dir", + "machine", "dir", "device", "status", "allocated", "size", + "modtime", "modby", "modwith", }; -static struct validate qgli_validate = { - qgli_valobj, - 5, +static struct validate gnfp_validate = { + VOmach0, + 1, 0, 0, 0, 0, - access_qgli, 0, - qualified_get_lists, + 0, + followup_fix_modby, }; -static char *gmol_fields[] = { - "list_name", - "member_type", "member_name", +static struct valobj anfp_valobj[] = { + {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 gmol_validate = { - VOlist0, - 1, - 0, - 0, - 0, +static struct validate anfp_validate = { + anfp_valobj, + 6, + "dir", + "mach_id = %d and dir = '%s'", + 2, + "nfsphys_id", 0, - access_visible_list, + prefetch_value, + set_nfsphys_modtime, +}; + +static struct validate unfp_validate = { + anfp_valobj, + 6, + "dir", + "mach_id = %d and dir = '%s'", + 2, + "nfsphys_id", 0, - get_members_of_list, + 0, + set_nfsphys_modtime, }; -static struct validate geml_validate = { - VOlist0, - 1, +static char *ajnf_fields[] = { + "machine", "dir", "adjustment", +}; + +static struct valobj ajnf_valobj[] = { + {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, + 3, + "dir", + "mach_id = %d and dir = '%s'", + 2, + "nfsphys_id", + 0, + 0, + set_nfsphys_modtime, +}; + +static char *dnfp_fields[] = { + "machine", "dir", +}; + +static struct validate dnfp_validate = { + anfp_valobj, + 2, + "dir", + "mach_id = %d and dir = '%s'", + 2, + "nfsphys_id", + 0, + setup_dnfp, + set_nfsphys_modtime, +}; + +static char *gqot_fields[] = { + "filesys", "type", "name", + "filesys", "type", "name", "quota", "dir", "machine", + "modtime", "modby", "modwith", +}; + +static struct valobj gqot_valobj[] = { + {V_TYPE, 1, 0, "quota_type", 0, MR_TYPE}, + {V_TYPEDATA, 2, 0, 0, 0, MR_ACE}, +}; + +static struct validate gqot_validate = { + gqot_valobj, + 2, 0, 0, 0, 0, - access_visible_list, 0, - get_end_members_of_list, + 0, + followup_gqot, }; -static char *glom_fields[] = { - "member_type", "member_name", - "list_name", "active", "publicflg", "hidden", "maillist", "grouplist", +static char *gqbf_fields[] = { + "filesys", + "filesys", "type", "name", "quota", "dir", "machine", + "modtime", "modby", "modwith", }; -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 struct validate gqbf_validate = { + 0, + 0, + 0, + 0, + 0, + 0, + access_filesys, + 0, + followup_gqot, }; -static struct validate glom_validate = { - glom_valobj, +static char *aqot_fields[] = { + "filesys", "type", "name", "quota", +}; + +static struct valobj aqot_valobj[] = { + {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, + "filsys_id", + "filsys_id = %d and type = '%s' and entity_id = %d", 3, 0, 0, + prefetch_filesys, + followup_aqot, +}; + +static struct validate uqot_validate = { + aqot_valobj, + 4, + "filsys_id", + "filsys_id = %d AND type = '%s' AND entity_id = %d", + 3, 0, 0, - access_member, + setup_dqot, + followup_aqot, +}; + +static struct validate dqot_validate = { + aqot_valobj, + 3, + "filsys_id", + "filsys_id = %d AND type = '%s' AND entity_id = %d", + 3, 0, - get_lists_of_member, + 0, + setup_dqot, + followup_dqot, }; -static char *cmol_fields[] = { - "list_name", - "count", +static char *gnfq_fields[] = { + "filesys", "login", + "filesys", "login", "quota", "dir", "machine", + "modtime", "modby", "modwith", }; -static struct validate cmol_validate = { - VOlist0, - 1, +static struct validate gnfq_validate = { 0, 0, 0, 0, - access_visible_list, 0, - count_members_of_list, + 0, + access_filesys, + 0, + followup_gqot, +}; + +static char *gnqp_fields[] = { + "machine", "dir", + "filesys", "login", "quota", "dir", "machine", + "modtime", "modby", "modwith", +}; + +static char *anfq_fields[] = { + "filesys", "login", "quota", +}; + +static struct valobj anfq_valobj[] = { + {V_ID, 0, FILESYS_TABLE, "label", "filsys_id", MR_FILESYS}, + {V_ID, 1, USERS_TABLE, "login", "users_id", MR_USER}, + {V_NUM, 2}, +}; + +static struct validate anfq_validate = { + anfq_valobj, + 3, + "filsys_id", + "filsys_id = %d AND type = 'USER' AND entity_id = %d", + 2, + 0, /* object ? */ + 0, + prefetch_filesys, + followup_aqot, +}; + +static struct validate unfq_validate = { + anfq_valobj, + 3, + "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, + 0, + setup_dqot, + followup_dqot, +}; + +static char *gzcl2_fields[] = { + "class", + "class", "xmt_type", "xmt_name", "sub_type", "sub_name", + "iws_type", "iws_name", "iui_type", "iui_name", + "modtime", "modby", "modwith", }; 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", "owner_type", + "owner_id", "modtime", "modby", "modwith", }; static struct validate gzcl_validate = { - VOwild0sort, - 2, 0, 0, 0, 0, 0, 0, + access_zephyr, + 0, followup_gzcl, }; -static char *azcl_fields[] = { - CLASS, "xmt_type", "xmt_name", "sub_type", "sub_name", +static char *azcl2_fields[] = { + "class", "xmt_type", "xmt_name", "sub_type", "sub_name", "iws_type", "iws_name", "iui_type", "iui_name", +}; + +static struct valobj azcl2_valobj[] = { + {V_CHAR, 0, ZEPHYR_TABLE, "class"}, + {V_TYPE, 1, 0, "zace_type", 0, MR_ACE}, + {V_TYPEDATA, 2, 0, 0, "list_id", MR_ACE}, + {V_TYPE, 3, 0, "zace_type", 0, MR_ACE}, + {V_TYPEDATA, 4, 0, 0, "list_id", MR_ACE}, + {V_TYPE, 5, 0, "zace_type", 0, MR_ACE}, + {V_TYPEDATA, 6, 0, 0, "list_id", MR_ACE}, + {V_TYPE, 7, 0, "zace_type", 0, MR_ACE}, + {V_TYPEDATA, 8, 0, 0, "list_id", MR_ACE}, +}; + +static struct validate azcl2_validate = { + azcl2_valobj, + 9, + "class", + "class = '%s'", + 1, + 0, + 0, + 0, + set_zephyr_modtime, +}; + +static char *azcl_fields[] = { + "class", "xmt_type", "xmt_name", "sub_type", "sub_name", + "iws_type", "iws_name", "iui_type", "iui_name", "owner_type", + "owner_id", }; static struct valobj azcl_valobj[] = { - {V_CHAR, 0}, - {V_TYPE, 1, ACE_TYPE, 0, 0, MR_ACE}, - {V_TYPEDATA, 2, 0, 0, LIST_ID, MR_ACE}, - {V_TYPE, 3, ACE_TYPE, 0, 0, MR_ACE}, - {V_TYPEDATA, 4, 0, 0, LIST_ID, MR_ACE}, - {V_TYPE, 5, ACE_TYPE, 0, 0, MR_ACE}, - {V_TYPEDATA, 6, 0, 0, LIST_ID, MR_ACE}, - {V_TYPE, 7, ACE_TYPE, 0, 0, MR_ACE}, - {V_TYPEDATA, 8, 0, 0, LIST_ID, MR_ACE}, + {V_CHAR, 0, ZEPHYR_TABLE, "class"}, + {V_TYPE, 1, 0, "zace_type", 0, MR_ACE}, + {V_TYPEDATA, 2, 0, 0, "list_id", MR_ACE}, + {V_TYPE, 3, 0, "zace_type", 0, MR_ACE}, + {V_TYPEDATA, 4, 0, 0, "list_id", MR_ACE}, + {V_TYPE, 5, 0, "zace_type", 0, MR_ACE}, + {V_TYPEDATA, 6, 0, 0, "list_id", MR_ACE}, + {V_TYPE, 7, 0, "zace_type", 0, MR_ACE}, + {V_TYPEDATA, 8, 0, 0, "list_id", MR_ACE}, + {V_TYPE, 9, 0, "ace_type", 0, MR_ACE}, + {V_TYPEDATA, 10, 0, 0, "list_id", MR_ACE}, }; static struct validate azcl_validate = { azcl_valobj, - 9, - CLASS, - "class = LEFT('%s',SIZE(class))", + 11, + "class", + "class = '%s'", 1, 0, 0, @@ -2186,31 +2525,64 @@ static struct validate azcl_validate = { set_zephyr_modtime, }; -static char *uzcl_fields[] = { - CLASS, "newclass", "xmt_type", "xmt_name", "sub_type", "sub_name", +static char *uzcl2_fields[] = { + "class", "newclass", "xmt_type", "xmt_name", "sub_type", "sub_name", "iws_type", "iws_name", "iui_type", "iui_name", }; +static struct valobj uzcl2_valobj[] = { + {V_NAME, 0, ZEPHYR_TABLE, "class", 0, MR_BAD_CLASS}, + {V_RENAME, 1, ZEPHYR_TABLE, "class", 0, MR_NOT_UNIQUE}, + {V_TYPE, 2, 0, "zace_type", 0, MR_ACE}, + {V_TYPEDATA, 3, 0, 0, "list_id", MR_ACE}, + {V_TYPE, 4, 0, "zace_type", 0, MR_ACE}, + {V_TYPEDATA, 5, 0, 0, "list_id", MR_ACE}, + {V_TYPE, 6, 0, "zace_type", 0, MR_ACE}, + {V_TYPEDATA, 7, 0, 0, "list_id", MR_ACE}, + {V_TYPE, 8, 0, "zace_type", 0, MR_ACE}, + {V_TYPEDATA, 9, 0, 0, "list_id", MR_ACE}, +}; + +static struct validate uzcl2_validate = { + uzcl2_valobj, + 10, + "class", + "class = '%s'", + 1, + 0, + access_zephyr, + 0, + set_zephyr_modtime, +}; + +static char *uzcl_fields[] = { + "class", "newclass", "xmt_type", "xmt_name", "sub_type", "sub_name", + "iws_type", "iws_name", "iui_type", "iui_name", "owner_type", "owner_id", +}; + static struct valobj uzcl_valobj[] = { - {V_RENAME, 1, "zephyr", CLASS, 0, MR_NOT_UNIQUE}, - {V_TYPE, 2, ACE_TYPE, 0, 0, MR_ACE}, - {V_TYPEDATA, 3, 0, 0, LIST_ID, MR_ACE}, - {V_TYPE, 4, ACE_TYPE, 0, 0, MR_ACE}, - {V_TYPEDATA, 5, 0, 0, LIST_ID, MR_ACE}, - {V_TYPE, 6, ACE_TYPE, 0, 0, MR_ACE}, - {V_TYPEDATA, 7, 0, 0, LIST_ID, MR_ACE}, - {V_TYPE, 8, ACE_TYPE, 0, 0, MR_ACE}, - {V_TYPEDATA, 9, 0, 0, LIST_ID, MR_ACE}, + {V_NAME, 0, ZEPHYR_TABLE, "class", 0, MR_BAD_CLASS}, + {V_RENAME, 1, ZEPHYR_TABLE, "class", 0, MR_NOT_UNIQUE}, + {V_TYPE, 2, 0, "zace_type", 0, MR_ACE}, + {V_TYPEDATA, 3, 0, 0, "list_id", MR_ACE}, + {V_TYPE, 4, 0, "zace_type", 0, MR_ACE}, + {V_TYPEDATA, 5, 0, 0, "list_id", MR_ACE}, + {V_TYPE, 6, 0, "zace_type", 0, MR_ACE}, + {V_TYPEDATA, 7, 0, 0, "list_id", MR_ACE}, + {V_TYPE, 8, 0, "zace_type", 0, MR_ACE}, + {V_TYPEDATA, 9, 0, 0, "list_id", MR_ACE}, + {V_TYPE, 10, 0, "ace_type", 0, MR_ACE}, + {V_TYPEDATA, 11, 0, 0, "list_id", MR_ACE}, }; static struct validate uzcl_validate = { uzcl_valobj, - 9, - CLASS, + 12, + "class", "class = '%s'", 1, 0, - 0, + access_zephyr, 0, set_zephyr_modtime, }; @@ -2218,7 +2590,7 @@ static struct validate uzcl_validate = { static struct validate dzcl_validate = { 0, 0, - CLASS, + "class", "class = '%s'", 1, 0, @@ -2227,146 +2599,357 @@ static struct validate dzcl_validate = { 0, }; -static char *gsvc_fields[] = { - SERVICE, - SERVICE, "protocol", "port", DESC, MOD1, MOD2, MOD3, -}; - -static char *asvc_fields[] = { - SERVICE, "protocol", "port", DESC, +static char *gsha_fields[] = { + "machine", + "machine", "ace_type", "ace_name", "modtime", "modby", "modwith", }; -static struct validate asvc_validate = { - VOchar0, - 1, - NAME, - "name = LEFT('%s',SIZE(name))", - 1, - 0, +static struct validate gsha_validate = +{ 0, 0, - set_modtime, -}; - -static char *gpce_fields[] = { - "printer", - "printer", "spooling_host", "spool_directory", "rprinter", - "quotaserver", "authenticate", "price", COMMENTS, - MOD1, MOD2, MOD3, -}; - -static struct validate gpce_validate = { - VOwild0sort, - 2, 0, 0, 0, 0, 0, 0, - followup_gpce, + followup_gsha, }; -static char *apce_fields[] = { - "printer", "spooling_host", "spool_directory", "rprinter", - "quotaserver", "authenticate", "price", COMMENTS, - MOD1, MOD2, MOD3, +static char *asha_fields[] = { + "machine", "ace_type", "ace_name", }; -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}, +static struct valobj asha_valobj[] = { + {V_ID, 0, MACHINE_TABLE, "name", "mach_id", MR_MACHINE}, + {V_TYPE, 1, 0, "ace_type", 0, MR_ACE}, + {V_TYPEDATA, 2, 0, 0, 0, MR_ACE}, }; -static struct validate apce_validate = { - apce_valobj, +static struct validate asha_validate = +{ + asha_valobj, 3, - NAME, - "name = LEFT('%s',SIZE(name))", + "mach_id", + "mach_id = %d", 1, + "mach_id", 0, 0, - 0, - set_modtime, + set_modtime_by_id, }; -static struct validate dpce_validate = { - 0, - 0, - NAME, - "name = '%s'", +static char *gacl_fields[] = { + "machine", "target", + "machine", "target", "kind", "list", +}; + +static char *aacl_fields[] = { + "machine", "target", "kind", "list", +}; + +static char *dacl_fields[] = { + "machine", "target", +}; + +static struct valobj aacl_valobj[] = { + {V_ID, 0, MACHINE_TABLE, "name", "mach_id", MR_MACHINE}, + {V_CHAR, 1, ACL_TABLE, "target"}, + {V_TYPE, 2, 0, "acl_kind", 0, MR_TYPE}, + {V_ID, 3, LIST_TABLE, "name", "list_id", MR_LIST}, +}; + +static struct validate gacl_validate = +{ + aacl_valobj, 1, + NULL, + NULL, + 0, + "mach_id", + /* access_acl */ 0, 0, 0, +}; + +static struct validate aacl_validate = +{ + aacl_valobj, + 4, + "mach_id", + "mach_id = %d AND target = '%s'", + 2, + "mach_id", + /* access_acl */ 0, 0, 0, }; -static char *gpcp_fields[] = { - "printer", - "printer", "spooling_host", "spool_directory", "rprinter", COMMENTS, - MOD1, MOD2, MOD3, +static char *gsvc_fields[] = { + "service", "protocol", + "service", "protocol", "port", "description", "modtime", "modby", "modwith", }; -static char *gpdm_fields[] = { - NAME, - NAME, "rpcnum", "host", MOD1, MOD2, MOD3, +static char *asvc_fields[] = { + "service", "protocol", "port", "description", }; -static char *apdm_fields[] = { - NAME, "rpcnum", "host" - }; +static char *dsvc_fields[] = { + "service", "protocol", +}; -static struct valobj apdm_valobj[] = { - {V_CHAR, 0}, - {V_ID, 2, MACHINE, NAME, MACH_ID, MR_MACHINE}, +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, "description"}, }; -static struct validate apdm_validate = { - apdm_valobj, +static struct validate asvc_validate = { + asvc_valobj, + 4, + "name", + "name = '%s' AND protocol = '%s'", 2, - NAME, - "name = LEFT('%s',SIZE(name))", - 1, 0, 0, 0, - set_modtime, + set_service_modtime, }; -static struct validate dpdm_validate = { - 0, - 0, - NAME, - "name = '%s'", - 1, +static struct validate dsvc_validate = { + asvc_valobj, + 2, + "name", + "name = '%s' AND protocol = '%s'", + 2, 0, 0, 0, 0, }; -static char *gali_fields[] = { - NAME, TYPE, "trans", - NAME, TYPE, "trans", +static char *gprn_fields[] = { + "name", + "name", "type", "hwtype", "duplexname", "hostname", + "loghost", "rm", "rp", "rq", "ka", "pc", "ac", "lpc_acl", + "banner", "location", "contact", "modtime", "modby", "modwith" }; -static char *aali_fields[] = { - NAME, TYPE, "trans", +static char *gpbd_fields[] = { + "duplexname", + "name", "type", "hwtype", "duplexname", "hostname", + "loghost", "rm", "rp", "rq", "ka", "pc", "ac", "lpc_acl", + "banner", "location", "contact", "modtime", "modby", "modwith" }; -static struct valobj aali_valobj[] = { - {V_CHAR, 0}, - {V_TYPE, 1, ALIAS, 0, 0, MR_TYPE}, - {V_CHAR, 2}, +static char *gpbe_fields[] = { + "hwaddr", + "name", "type", "hwtype", "duplexname", "hostname", + "loghost", "rm", "rp", "rq", "ka", "pc", "ac", "lpc_acl", + "banner", "location", "contact", "modtime", "modby", "modwith" +}; + +static char *gpbh_fields[] = { + "hostname", + "name", "type", "hwtype", "duplexname", "hostname", + "loghost", "rm", "rp", "rq", "ka", "pc", "ac", "lpc_acl", + "banner", "location", "contact", "modtime", "modby", "modwith" +}; + +static char *gpbr_fields[] = { + "rm", + "name", "type", "hwtype", "duplexname", "hostname", + "loghost", "rm", "rp", "rq", "ka", "pc", "ac", "lpc_acl", + "banner", "location", "contact", "modtime", "modby", "modwith" +}; + +static char *gpbl_fields[] = { + "location", + "name", "type", "hwtype", "duplexname", "hostname", + "loghost", "rm", "rp", "rq", "ka", "pc", "ac", "lpc_acl", + "banner", "location", "contact", "modtime", "modby", "modwith" +}; + +static char *gpbc_fields[] = { + "contact", + "name", "type", "hwtype", "duplexname", "hostname", + "loghost", "rm", "rp", "rq", "ka", "pc", "ac", "lpc_acl", + "banner", "location", "contact", "modtime", "modby", "modwith" +}; + +static char *aprn_fields[] = { + "printer", "type", "hwtype", "duplexname", "hostname", + "loghost", "rm", "rp", "rq", "ka", "pc", "ac", "lpc_acl", + "banner", "location", "contact", +}; + +static struct valobj aprn_valobj[] = { + {V_CHAR, 0, PRINTERS_TABLE, "name"}, + {V_TYPE, 1, 0, "printertype", 0, MR_TYPE}, + {V_TYPE, 2, 0, "printerhwtype", 0, MR_TYPE}, + {V_CHAR, 3, PRINTERS_TABLE, "duplexname"}, + {V_ID, 4, MACHINE_TABLE, "name", "mach_id", MR_MACHINE}, + {V_ID, 5, MACHINE_TABLE, "name", "mach_id", MR_MACHINE}, + {V_ID, 6, MACHINE_TABLE, "name", "mach_id", MR_MACHINE}, + {V_CHAR, 7, PRINTERS_TABLE, "rp"}, + {V_ID, 8, MACHINE_TABLE, "name", "mach_id", MR_MACHINE}, + {V_NUM, 9}, + {V_NUM, 10}, + {V_ID, 11, LIST_TABLE, "name", "list_id", MR_LIST}, + {V_ID, 12, LIST_TABLE, "name", "list_id", MR_LIST}, + {V_NUM, 13}, + {V_CHAR, 14, PRINTERS_TABLE, "location"}, + {V_CHAR, 15, PRINTERS_TABLE, "contact"}, +}; + +static struct validate aprn_validate = { + aprn_valobj, + 16, + "name", + "name = '%s'", + 1, + 0, + access_printer, + setup_aprn, + set_modtime, +}; + +static char *uprn_fields[] = { + "printer", + "printer", "type", "hwtype", "duplexname", "hostname", + "loghost", "rm", "rp", "rq", "ka", "pc", "ac", "lpc_acl", + "banner", "location", "contact", +}; + +static struct valobj uprn_valobj[] = { + {V_CHAR, 0, PRINTERS_TABLE, "name"}, + {V_CHAR, 1, PRINTERS_TABLE, "name"}, + {V_TYPE, 2, 0, "printertype", 0, MR_TYPE}, + {V_TYPE, 3, 0, "printerhwtype", 0, MR_TYPE}, + {V_CHAR, 4, PRINTERS_TABLE, "duplexname"}, + {V_ID, 5, MACHINE_TABLE, "name", "mach_id", MR_MACHINE}, + {V_ID, 6, MACHINE_TABLE, "name", "mach_id", MR_MACHINE}, + {V_ID, 7, MACHINE_TABLE, "name", "mach_id", MR_MACHINE}, + {V_CHAR, 8, PRINTERS_TABLE, "rp"}, + {V_ID, 9, MACHINE_TABLE, "name", "mach_id", MR_MACHINE}, + {V_NUM, 10}, + {V_NUM, 11}, + {V_ID, 12, LIST_TABLE, "name", "list_id", MR_LIST}, + {V_ID, 13, LIST_TABLE, "name", "list_id", MR_LIST}, + {V_NUM, 14}, + {V_CHAR, 15, PRINTERS_TABLE, "location"}, + {V_CHAR, 16, PRINTERS_TABLE, "contact"}, +}; + +static struct validate uprn_validate = { + uprn_valobj, + 16, + "name", + "name = '%s'", + 1, + 0, + access_printer, + setup_aprn, + set_modtime, +}; + +static struct validate dprn_validate = { + 0, + 0, + "name", + "name = '%s'", + 1, + 0, + access_printer, + 0, + 0, +}; + +static char *gpsv_fields[] = { + "host", + "host", "kind", "printer_types", "owner_type", "owner_name", + "lpc_acl", "modtime", "modby", "modwith" +}; + +static struct valobj gpsv_valobj[] = { + {V_ID, 0, MACHINE_TABLE, "name", "mach_id", MR_MACHINE}, +}; + +static struct validate gpsv_validate = { + gpsv_valobj, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + followup_gpsv, +}; + +static char *apsv_fields[] = { + "host", "kind", "printer_types", "owner_type", "owner_name", "lpc_acl" +}; + +static struct valobj apsv_valobj[] = { + {V_ID, 0, MACHINE_TABLE, "name", "mach_id", MR_MACHINE}, + {V_TYPE, 1, 0, "lpd_kind", 0, MR_TYPE}, + {V_ID, 2, STRINGS_TABLE, "string", "string_id", MR_STRING}, + {V_TYPE, 3, 0, "ace_type", 0, MR_ACE}, + {V_TYPEDATA, 4, 0, 0, 0, MR_ACE}, + {V_ID, 5, LIST_TABLE, "name", "list_id", MR_LIST}, +}; + +static struct validate apsv_validate = { + apsv_valobj, + 6, + "mach_id", + "mach_id = %d", + 1, + "mach_id", + 0, + 0, + set_modtime_by_id, +}; + +static char *dpsv_fields[] = { + "host", +}; + +static struct validate dpsv_validate = { + gpsv_valobj, + 1, + "mach_id", + "mach_id = %d", + 1, + 0, + 0, + setup_dpsv, + 0, +}; + +static char *gali_fields[] = { + "name", "type", "trans", + "name", "type", "trans", +}; + +static char *aali_fields[] = { + "name", "type", "trans", +}; + +static struct valobj aali_valobj[] = { + {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", - "name = LEFT('%s',SIZE(name)) and type = '%s' and trans = LEFT('%s',SIZE(trans))", + "name = '%s' and type = '%s' and trans = '%s'", 3, 0, 0, @@ -2388,11 +2971,11 @@ static struct validate dali_validate = /* DELETE_ALIAS */ }; static char *gval_fields[] = { - NAME, "value", + "name", "value", }; 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 = { @@ -2408,15 +2991,20 @@ static struct validate gval_validate = { }; static char *aval_fields[] = { - NAME, "value", + "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, - NAME, - "name = LEFT('%s',SIZE(name))", /* LEFT() only needed for aval */ + aval_valobj, + 2, + "name", + "name = '%s'", 1, 0, 0, @@ -2425,253 +3013,783 @@ static struct validate aval_validate = /* for aval, uval, and dval */ }; static char *dval_fields[] = { - NAME, + "name", }; static char *gats_fields[] = { - "table_name", "appends", "updates", "deletes", MOD1, MOD2, MOD3, + "table_name", "appends", "updates", "deletes", + "modtime", "modby", "modwith", }; static char *_sdl_fields[] = { - "level", + "level", }; -static struct validate _sdl_validate = +static struct validate _sdl_validate = { - 0, - 0, - (char *)0, - (char *)0, - 0, - 0, - 0, - 0, - _sdl_followup, + VOnum0, + 1, + NULL, + NULL, + 0, + 0, + 0, + 0, + _sdl_followup, +}; + +static char *gusl_fields[] = { + "login", "domain_sid", + "login", "sid", "created", +}; + +static struct validate gusl_validate = +{ + VOuser0, + 1, + NULL, + NULL, + 0, + 0, + 0, + 0, + 0, +}; + +static char *glsn_fields[] = { + "name", "domain_sid", + "name", "sid", "created", +}; + +static struct validate glsn_validate = +{ + VOlist0, + 1, + NULL, + NULL, + 0, + 0, + 0, + 0, + 0, +}; + +static char *ausl_fields[] = { + "login", "sid", +}; + +static struct validate ausl_validate = +{ + VOuser0, + 1, + "sid", + "users_id = %d AND sid = '%s'", + 2, + 0, + 0, + 0, + 0, +}; + +static char *alsn_fields[] = { + "name", "sid", +}; + +static struct validate alsn_validate = +{ + VOlist0, + 1, + "sid", + "list_id = %d AND sid = '%s'", + 2, + 0, + 0, + 0, + 0, +}; + +static char *gdds_fields[] = { + "sid", +}; + +static char *gcon_fields[] = { + "name", + "name", "description", "location", "contact", + "ace_type", "ace_name", "memace_type", "memace_name", "modtime", "modby", "modwith", +}; + +static struct validate gcon_validate = { + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + followup_gcon, +}; + +static char *acon_fields[] = { + "name", "description", "location", "contact", + "ace_type", "ace_name", "memace_type", "memace_name", +}; + +static struct valobj acon_valobj[] = { + {V_CHAR, 0, CONTAINERS_TABLE, "name"}, + {V_LEN, 1, CONTAINERS_TABLE, "description"}, + {V_CHAR, 2, CONTAINERS_TABLE, "location"}, + {V_CHAR, 3, CONTAINERS_TABLE, "contact"}, + {V_TYPE, 4, 0, "ace_type", 0, MR_ACE}, + {V_TYPEDATA, 5, 0, 0, 0, MR_ACE}, + {V_TYPE, 6, 0, "ace_type", 0, MR_ACE}, + {V_TYPEDATA, 7, 0, 0, 0, MR_ACE}, +}; + +static struct validate acon_validate = +{ + acon_valobj, + 8, + "name", + "name = '%s'", + 1, + "cnt_id", + 0, + prefetch_value, + set_modtime, +}; + +static char *ucon_fields[] = { + "name", + "newname", "description", "location", "contact", + "ace_type", "ace_name", "memace_type", "memace_name", +}; + +static struct valobj ucon_valobj[] = { + {V_ID, 0, CONTAINERS_TABLE, "name", "cnt_id", MR_CONTAINER}, + {V_RENAME, 1, CONTAINERS_TABLE, "name", "cnt_id", MR_NOT_UNIQUE}, + {V_LEN, 2, CONTAINERS_TABLE, "description"}, + {V_CHAR, 3, CONTAINERS_TABLE, "location"}, + {V_CHAR, 4, CONTAINERS_TABLE, "contact"}, + {V_TYPE, 5, 0, "ace_type", 0, MR_ACE}, + {V_TYPEDATA, 6, 0, 0, 0, MR_ACE}, + {V_TYPE, 7, 0, "ace_type", 0, MR_ACE}, + {V_TYPEDATA, 8, 0, 0, 0, MR_ACE}, +}; + +static struct validate ucon_validate = +{ + ucon_valobj, + 9, + 0, + 0, + 0, + 0, + access_container, + 0, + update_container, +}; + +static char *dcon_fields[] = { + "name", +}; + +static struct validate dcon_validate = +{ + VOcon0, + 1, + 0, + 0, + 0, + 0, + 0, + setup_dcon, + 0, +}; + +static char *amcn_fields[] = { + "machine", "container", +}; + +static struct valobj amcn_valobj[] = /* ADD_MACHINE_TO_CONTAINER */ +{ /* DELETE_MACHINE_FROM_CONTAINER */ + {V_ID, 0, MACHINE_TABLE, "name", "mach_id", MR_MACHINE}, + {V_ID, 1, CONTAINERS_TABLE, "name", "cnt_id", MR_CONTAINER}, +}; + +static struct validate amcn_validate = /* for amtn and dmfn */ +{ + amcn_valobj, + 2, + "mach_id", + "mach_id = %d", + 1, + 0, + access_container, + 0, + set_mach_modtime_by_id, +}; + +static struct validate dmcn_validate = /* for amtn and dmfn */ +{ + amcn_valobj, + 2, + "mach_id", + "mach_id = %d and cnt_id = %d", + 2, + 0, + access_container, + 0, + set_mach_modtime_by_id, +}; + +static char *gmnm_fields[] = { + "machine", + "machine", "container", +}; + +static char *gmoc_fields[] = { + "container", + "isrecursive", + "machine", + "container", +}; + +static struct validate gmoc_validate = +{ + VOcon0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + get_machines_of_container, +}; + +static char *gsoc_fields[] = { + "container", + "isrecursive", + "subcontainer", +}; + +static struct validate gsoc_validate = +{ + VOcon0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + get_subcontainers_of_container, +}; + +static char *gtlc_fields[] = { + "name", }; - /* Generalized Query Definitions */ +/* Multiple versions of the same query MUST be listed in ascending + * order. + */ + /* 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[] = { +struct query Queries[] = { { - /* Q_GALO - GET_ALL_LOGINS */ + /* Q_GALO - GET_ALL_LOGINS, v2 */ "get_all_logins", "galo", + 2, RETRIEVE, "u", - USERS, - "CHAR(u.login), CHAR(u.uid), u.shell, CHAR(u.last), CHAR(u.first), u.middle FROM users u", - galo_fields, + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.last, u.first, u.middle FROM users u", + galo2_fields, 6, "u.users_id != 0", 0, - &VDsort0, + "u.login", + 0, }, - + { - /* Q_GAAL - GET_ALL_ACTIVE_LOGINS */ - "get_all_active_logins", - "gaal", + /* Q_GALO - GET_ALL_LOGINS, v3 */ + "get_all_logins", + "galo", + 3, RETRIEVE, "u", - USERS, - "CHAR(u.login), CHAR(u.uid), u.shell, CHAR(u.last), CHAR(u.first), u.middle FROM users u", + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.winconsoleshell, u.last, u.first, u.middle FROM users u", galo_fields, + 7, + "u.users_id != 0", + 0, + "u.login", + 0, + }, + + { + /* Q_GAAL - GET_ALL_ACTIVE_LOGINS, v2 */ + "get_all_active_logins", + "gaal", + 2, + RETRIEVE, + "u", + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.last, u.first, u.middle FROM users u", + galo2_fields, 6, "u.status = 1", 0, - &VDsort0, + "u.login", + 0, }, - + + { + /* Q_GAAL - GET_ALL_ACTIVE_LOGINS, v3 */ + "get_all_active_logins", + "gaal", + 3, + RETRIEVE, + "u", + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.winconsoleshell, u.last, u.first, u.middle FROM users u", + galo_fields, + 7, + "u.status = 1", + 0, + "u.login", + 0, + }, + { - /* Q_GUAL - GET_USER_ACCOUNT_BY_LOGIN */ + /* Q_GUAL - GET_USER_ACCOUNT_BY_LOGIN, v2 */ "get_user_account_by_login", "gual", + 2, RETRIEVE, "u", - USERS, - "CHAR(u.login), CHAR(u.uid), u.shell, CHAR(u.last), CHAR(u.first), u.middle, CHAR(u.status), CHAR(u.clearid), u.type, CHAR(str.string), CHAR(u.signature), CHAR(u.secure), CHAR(u.modtime), CHAR(u.modby), u.modwith FROM users u, strings str", - gual_fields, + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.last, u.first, u.middle, u.status, u.clearid, u.type, str.string, CHR(0), u.secure, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith FROM users u, strings str", + gual2_fields, 15, - "u.login LIKE '%s' ESCAPE '*' AND u.users_id != 0 AND u.comment = str.string_id", + "u.login LIKE '%s' AND u.users_id != 0 AND u.comments = str.string_id", 1, + "u.login", &gubl_validate, }, - + { - /* Q_GUAU - GET_USER_ACCOUNT_BY_UID */ + /* Q_GUAL - GET_USER_ACCOUNT_BY_LOGIN, v3 */ + "get_user_account_by_login", + "gual", + 3, + RETRIEVE, + "u", + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.winconsoleshell, u.last, u.first, u.middle, u.status, u.clearid, u.type, str.string, CHR(0), u.secure, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith FROM users u, strings str", + gual_fields, + 16, + "u.login LIKE '%s' AND u.users_id != 0 AND u.comments = str.string_id", + 1, + "u.login", + &gubl_validate, + }, + + { + /* Q_GUAU - GET_USER_ACCOUNT_BY_UID, v2 */ "get_user_account_by_uid", "guau", + 2, RETRIEVE, "u", - USERS, - "CHAR(u.login), CHAR(u.uid), u.shell, CHAR(u.last), CHAR(u.first), u.middle, CHAR(u.status), CHAR(u.clearid), u.type, CHAR(str.string), CHAR(u.signature), CHAR(u.secure), CHAR(u.modtime), CHAR(u.modby), u.modwith FROM users u, strings str", - guau_fields, + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.last, u.first, u.middle, u.status, u.clearid, u.type, str.string, CHR(0), u.secure, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith FROM users u, strings str", + guau2_fields, 15, - "u.uid = %s AND u.users_id != 0 AND u.comment = str.string_id", + "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 */ + /* Q_GUAU - GET_USER_ACCOUNT_BY_UID, v3 */ + "get_user_account_by_uid", + "guau", + 3, + RETRIEVE, + "u", + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.winconsoleshell, u.last, u.first, u.middle, u.status, u.clearid, u.type, str.string, CHR(0), u.secure, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith FROM users u, strings str", + guau_fields, + 16, + "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, v2 */ "get_user_account_by_name", "guan", + 2, RETRIEVE, "u", - USERS, - "CHAR(u.login), CHAR(u.uid), u.shell, CHAR(u.last), CHAR(u.first), u.middle, CHAR(u.status), CHAR(u.clearid), u.type, CHAR(str.string), CHAR(u.signature), CHAR(u.secure), CHAR(u.modtime), CHAR(u.modby), u.modwith FROM users u, strings str", - guan_fields, + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.last, u.first, u.middle, u.status, u.clearid, u.type, str.string, CHR(0), u.secure, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith FROM users u, strings str", + guan2_fields, 15, - "u.first LIKE '%s' ESCAPE '*' AND u.last LIKE '%s' ESCAPE '*' AND u.users_id != 0 and u.comment = str.string_id", + "u.first LIKE '%s' AND u.last LIKE '%s' AND u.users_id != 0 and u.comments = str.string_id", 2, + "u.login", &guan_validate, }, - + { - /* Q_GUAC - GET_USER_ACCOUNT_BY_CLASS */ + /* Q_GUAN - GET_USER_ACCOUNT_BY_NAME, v3 */ + "get_user_account_by_name", + "guan", + 3, + RETRIEVE, + "u", + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.winconsoleshell, u.last, u.first, u.middle, u.status, u.clearid, u.type, str.string, CHR(0), u.secure, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith FROM users u, strings str", + guan_fields, + 16, + "u.first LIKE '%s' AND u.last LIKE '%s' AND u.users_id != 0 and u.comments = str.string_id", + 2, + "u.login", + &guan_validate, + }, + + { + /* Q_GUAC - GET_USER_ACCOUNT_BY_CLASS, v2 */ + "get_user_account_by_class", + "guac", + 2, + 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, CHR(0), u.secure, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith FROM users u, strings str", + guac2_fields, + 15, + "u.type = UPPER('%s') AND u.users_id != 0 AND u.comments = str.string_id", + 1, + "u.login", + &VDfix_modby, + }, + + { + /* Q_GUAC - GET_USER_ACCOUNT_BY_CLASS, v3 */ "get_user_account_by_class", "guac", + 3, RETRIEVE, "u", - USERS, - "CHAR(u.login), CHAR(u.uid), u.shell, CHAR(u.last), CHAR(u.first), u.middle, CHAR(u.status), CHAR(u.clearid), u.type, CHAR(str.string), CHAR(u.signature), CHAR(u.secure), CHAR(u.modtime), CHAR(u.modby), u.modwith FROM users u, strings str", + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.winconsoleshell, u.last, u.first, u.middle, u.status, u.clearid, u.type, str.string, CHR(0), u.secure, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith FROM users u, strings str", guac_fields, + 16, + "u.type = UPPER('%s') AND u.users_id != 0 AND u.comments = str.string_id", + 1, + "u.login", + &VDfix_modby, + }, + + { + /* Q_GUAM - GET_USER_ACCOUNT_BY_MITID, v2 */ + "get_user_account_by_id", + "guai", + 2, + 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, CHR(0), u.secure, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith FROM users u, strings str", + guam2_fields, 15, - "u.type = uppercase('%s') AND u.users_id != 0 AND u.comment = str.string_id", + "u.clearid LIKE '%s' AND u.users_id != 0 AND u.comments = str.string_id", 1, - &VDsortf, + "u.login", + &VDfix_modby, }, - + { - /* Q_GUAM - GET_USER_ACCOUNT_BY_MITID */ + /* Q_GUAM - GET_USER_ACCOUNT_BY_MITID, v3 */ "get_user_account_by_id", "guai", + 3, RETRIEVE, "u", - USERS, - "CHAR(u.login), CHAR(u.uid), u.shell, CHAR(u.last), CHAR(u.first), u.middle, CHAR(u.status), CHAR(u.clearid), u.type, CHAR(str.string), CHAR(u.signature), CHAR(u.secure), CHAR(u.modtime), CHAR(u.modby), u.modwith FROM users u, strings str", + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.winconsoleshell, u.last, u.first, u.middle, u.status, u.clearid, u.type, str.string, CHR(0), 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.comment = str.string_id", + 16, + "u.clearid LIKE '%s' AND u.users_id != 0 AND u.comments = str.string_id", 1, - &VDwildsortf, + "u.login", + &VDfix_modby, }, - + { - /* Q_GUBL - GET_USER_BY_LOGIN */ + /* Q_GUBL - GET_USER_BY_LOGIN, v2 */ "get_user_by_login", "gubl", + 2, RETRIEVE, "u", - USERS, - "CHAR(u.login), CHAR(u.uid), u.shell, CHAR(u.last), CHAR(u.first), u.middle, CHAR(u.status), CHAR(u.clearid), u.type, CHAR(u.modtime), CHAR(u.modby), u.modwith FROM users u", - gubl_fields, + 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", + gubl2_fields, 12, - "u.login LIKE '%s' ESCAPE '*' AND u.users_id != 0", + "u.login LIKE '%s' AND u.users_id != 0", 1, + "u.login", &gubl_validate, }, - + + { + /* Q_GUBL - GET_USER_BY_LOGIN, v3 */ + "get_user_by_login", + "gubl", + 3, + RETRIEVE, + "u", + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.winconsoleshell, 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, + 13, + "u.login LIKE '%s' AND u.users_id != 0", + 1, + "u.login", + &gubl_validate, + }, + { - /* Q_GUBU - GET_USER_BY_UID */ + /* Q_GUBU - GET_USER_BY_UID, v2 */ "get_user_by_uid", "gubu", + 2, RETRIEVE, "u", - USERS, - "CHAR(u.login), CHAR(u.uid), u.shell, CHAR(u.last), CHAR(u.first), u.middle, CHAR(u.status), CHAR(u.clearid), u.type, CHAR(u.modtime), CHAR(u.modby), u.modwith FROM users u", - gubu_fields, + 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", + gubu2_fields, 12, - "u.uid = %s AND u.users_id != 0", + "u.unix_uid = %s AND u.users_id != 0", 1, + "u.login", &gubu_validate, }, - + + { + /* Q_GUBU - GET_USER_BY_UID, v3 */ + "get_user_by_uid", + "gubu", + 3, + RETRIEVE, + "u", + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.winconsoleshell, 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, + 13, + "u.unix_uid = %s AND u.users_id != 0", + 1, + "u.login", + &gubu_validate, + }, + { - /* Q_GUBN - GET_USER_BY_NAME */ + /* Q_GUBN - GET_USER_BY_NAME, v2 */ "get_user_by_name", "gubn", + 2, RETRIEVE, "u", - USERS, - "CHAR(u.login), CHAR(u.uid), u.shell, CHAR(u.last), CHAR(u.first), u.middle, CHAR(u.status), CHAR(u.clearid), u.type, CHAR(u.modtime), CHAR(u.modby), u.modwith FROM users u", - gubn_fields, + 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", + gubn2_fields, 12, - "u.first LIKE '%s' ESCAPE '*' AND u.last LIKE '%s' ESCAPE '*' AND u.users_id != 0", + "u.first LIKE '%s' AND u.last LIKE '%s' AND u.users_id != 0", 2, + "u.login", &gubn_validate, }, - + + { + /* Q_GUBN - GET_USER_BY_NAME, v3 */ + "get_user_by_name", + "gubn", + 3, + RETRIEVE, + "u", + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.winconsoleshell, 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, + 13, + "u.first LIKE '%s' AND u.last LIKE '%s' AND u.users_id != 0", + 2, + "u.login", + &gubn_validate, + }, + + { + /* Q_GUBC - GET_USER_BY_CLASS, v2 */ + "get_user_by_class", + "gubc", + 2, + RETRIEVE, + "u", + 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", + gubc2_fields, + 12, + "u.type = UPPER('%s') AND u.users_id != 0", + 1, + "u.login", + &VDfix_modby, + }, + { - /* Q_GUBC - GET_USER_BY_CLASS */ + /* Q_GUBC - GET_USER_BY_CLASS, v3 */ "get_user_by_class", "gubc", + 3, RETRIEVE, "u", - USERS, - "CHAR(u.login), CHAR(u.uid), u.shell, CHAR(u.last), CHAR(u.first), u.middle, CHAR(u.status), CHAR(u.clearid), u.type, CHAR(u.modtime), CHAR(u.modby), u.modwith FROM users u", + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.winconsoleshell, 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, + 13, + "u.type = UPPER('%s') AND u.users_id != 0", + 1, + "u.login", + &VDfix_modby, + }, + + { + /* Q_GUBM - GET_USER_BY_MITID, v2 */ + "get_user_by_mitid", + "gubm", + 2, + RETRIEVE, + "u", + 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", + gubm2_fields, 12, - "u.type = uppercase('%s') AND u.users_id != 0", + "u.clearid LIKE '%s' AND u.users_id != 0", 1, - &VDsortf, + "u.login", + &VDfix_modby, }, - + { - /* Q_GUBM - GET_USER_BY_MITID */ + /* Q_GUBM - GET_USER_BY_MITID, v3 */ "get_user_by_mitid", "gubm", + 3, RETRIEVE, "u", - USERS, - "CHAR(u.login), CHAR(u.uid), u.shell, CHAR(u.last), CHAR(u.first), u.middle, CHAR(u.status), CHAR(u.clearid), u.type, CHAR(u.modtime), CHAR(u.modby), u.modwith FROM users u", + USERS_TABLE, + "u.login, u.unix_uid, u.shell, u.winconsoleshell, 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, - "u.clearid LIKE '%s' ESCAPE '*' AND u.users_id != 0", + 13, + "u.clearid LIKE '%s' AND u.users_id != 0", 1, - &VDwildsortf, + "u.login", + &VDfix_modby, }, - + { - /* Q_AUAC - ADD_USER_ACCOUNT */ /* uses prefetch_value() for users_id */ + /* Q_AUAC - ADD_USER_ACCOUNT, v2 */ /* uses prefetch_value() for users_id */ "add_user_account", "auac", + 2, APPEND, "u", - USERS, - "INTO users (login, uid, shell, last, first, middle, status, clearid, type, comment, signature, secure, users_id) VALUES ('%s', %s, '%s', '%s', '%s', '%s', %s, '%s', '%s', %d, '%s', %s, %s)", - auac_fields, + USERS_TABLE, + /* We set signature to "NVL(CHR(0), '%s')", which is to say, "CHR(0)", + * but using up one argv element. + */ + "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, NVL(CHR(0), '%s'), %s, %s)", + auac2_fields, 12, - (char *)0, + NULL, + 0, + NULL, + &auac2_validate, + }, + + { + /* Q_AUAC - ADD_USER_ACCOUNT, v3 */ /* uses prefetch_value() for users_id */ + "add_user_account", + "auac", + 3, + APPEND, + "u", + USERS_TABLE, + /* We set signature to "NVL(CHR(0), '%s')", which is to say, "CHR(0)", + * but using up one argv element. + */ + "INTO users (login, unix_uid, shell, winconsoleshell, 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)), NVL('%s', CHR(0)), %s, NVL('%s', CHR(0)), '%s', %d, NVL(CHR(0), '%s'), %s, %s)", + auac_fields, + 13, + NULL, 0, + NULL, &auac_validate, }, - + { - /* Q_AUSR - ADD_USER */ /* uses prefetch_value() for users_id */ + /* Q_AUSR - ADD_USER, v2 */ /* uses prefetch_value() for users_id */ "add_user", "ausr", + 2, APPEND, "u", - USERS, - "INTO users (login, uid, shell, last, first, middle, status, clearid, type, comment, signature, secure, users_id) VALUES ('%s', %s, '%s', '%s', '%s', '%s', %s, '%s', '%s', 0, '', 0, %s)", - auac_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)", + auac2_fields, 9, 0, 0, + NULL, + &ausr2_validate, + }, + + { + /* Q_AUSR - ADD_USER, v3 */ /* uses prefetch_value() for users_id */ + "add_user", + "ausr", + 3, + APPEND, + "u", + USERS_TABLE, + "INTO users (login, unix_uid, shell, winconsoleshell, 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, + 10, + 0, + 0, + NULL, &ausr_validate, }, - + { /* Q_RUSR - REGISTER_USER */ "register_user", "rusr", + 2, APPEND, 0, 0, @@ -2680,36 +3798,77 @@ struct query Queries2[] = { 3, 0, 0, + NULL, &rusr_validate, }, - + { - /* Q_UUAC - UPDATE_USER_ACCOUNT */ + /* Q_UUAC - UPDATE_USER_ACCOUNT, v2 */ "update_user_account", "uuac", + 2, UPDATE, "u", - USERS, - "users SET login = '%s', uid = %s, shell = '%s', last = '%s', first = '%s', middle = '%s', status = %s, clearid = '%s', type = '%s', comment = %d, signature = '%s', secure = %s", - uuac_fields, + USERS_TABLE, + /* See comment in auac about signature. */ + "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 = NVL(CHR(0), '%s'), secure = %s", + uuac2_fields, 12, "users_id = %d", 1, + NULL, + &uuac2_validate, + }, + + { + /* Q_UUAC - UPDATE_USER_ACCOUNT, v3 */ + "update_user_account", + "uuac", + 3, + UPDATE, + "u", + USERS_TABLE, + /* See comment in auac about signature. */ + "users SET login = '%s', unix_uid = %s, shell = '%s', winconsoleshell = '%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 = NVL(CHR(0), '%s'), secure = %s", + uuac_fields, + 13, + "users_id = %d", + 1, + NULL, &uuac_validate, }, - + { - /* Q_UUSR - UPDATE_USER */ + /* Q_UUSR - UPDATE_USER, v2 */ "update_user", "uusr", + 2, UPDATE, "u", - USERS, - "users SET login = '%s', uid = %s, shell = '%s', last = '%s', first = '%s', middle = '%s', status = %s, clearid = '%s', type = '%s'", - uuac_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'", + uuac2_fields, 9, "users_id = %d", 1, + NULL, + &uusr2_validate, + }, + + { + /* Q_UUSR - UPDATE_USER, v3 */ + "update_user", + "uusr", + 3, + UPDATE, + "u", + USERS_TABLE, + "users SET login = '%s', unix_uid = %s, shell = '%s', winconsoleshell = '%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, + 10, + "users_id = %d", + 1, + NULL, &uusr_validate, }, @@ -2717,29 +3876,50 @@ struct query Queries2[] = { /* Q_UUSH - UPDATE_USER_SHELL */ "update_user_shell", "uush", + 2, UPDATE, "u", - USERS, - "users SET shell = '%s'", + USERS_TABLE, + "users SET shell = '%s'", uush_fields, 1, "users_id = %d", 1, + NULL, &uush_validate, }, + { + /* Q_UUWS - UPDATE_USER_WINDOWS_SHELL */ + "update_user_windows_shell", + "uuws", + 2, + UPDATE, + "u", + USERS_TABLE, + "users SET winconsoleshell = '%s'", + uuws_fields, + 1, + "users_id = %d", + 1, + NULL, + &uuws_validate, + }, + { /* Q_UUST - UPDATE_USER_STATUS */ "update_user_status", "uust", + 2, UPDATE, "u", - USERS, + USERS_TABLE, "users SET status = %s", uust_fields, 1, "users_id = %d", 1, + NULL, &uust_validate, }, @@ -2747,74 +3927,135 @@ struct query Queries2[] = { /* Q_UUSS - UPDATE_USER_SECURITY_STATUS */ "update_user_security_status", "uuss", + 2, UPDATE, "u", - USERS, + USERS_TABLE, "users SET secure = %s", uuss_fields, 1, "users_id = %d", 1, + NULL, &uust_validate, }, - + { - /* Q_DUSR - DELETE_USER */ + /* Q_DUSR - DELETE_USER */ "delete_user", "dusr", + 2, DELETE, "u", - USERS, - (char *)0, + USERS_TABLE, + NULL, dusr_fields, 0, "users_id = %d", 1, + NULL, &dusr_validate, }, { - /* Q_DUBU - DELETE_USER_BY_UID */ - "delete_user_by_uid", - "dubu", - DELETE, - "u", - USERS, - (char *)0, - dubu_fields, + /* Q_AURV - ADD_USER_RESERVATION */ + "add_user_reservation", + "aurv", + 2, + UPDATE, + 0, + USERS_TABLE, + 0, + aurv_fields, + 2, + 0, + 0, + NULL, + &aurv_validate, + }, + + { + /* Q_GURV - GET_USER_RESERVATIONS */ + "get_user_reservations", + "gurv", + 2, + RETRIEVE, + 0, + USERS_TABLE, + 0, + gurv_fields, + 2, 0, - "users_id = %d", 1, - &dubu_validate, + NULL, + &gurv_validate, }, { - /* Q_GKUM - GET_KERBEROS_USER_MAP */ + /* Q_GUBR - GET_USER_BY_RESERVATION */ + "get_user_by_reservation", + "gubr", + 2, + RETRIEVE, + 0, + USERS_TABLE, + 0, + gubr_fields, + 1, + 0, + 1, + NULL, + &gubr_validate, + }, + + { + /* Q_DURV - DELETE_USER_RESERVATION */ + "delete_user_reservation", + "durv", + 2, + UPDATE, + 0, + USERS_TABLE, + 0, + aurv_fields, + 2, + 0, + 0, + NULL, + &aurv_validate, + }, + + { + /* Q_GKUM - GET_KERBEROS_USER_MAP */ "get_kerberos_user_map", "gkum", + 2, RETRIEVE, "k", - "krbmap", - "CHAR(u.login), CHAR(str.string) FROM krbmap km, users u, strings str", + KRBMAP_TABLE, + "u.login, str.string FROM krbmap km, users u, strings str", gkum_fields, 2, - "u.login LIKE '%s' ESCAPE '*' AND str.string LIKE '%s' ESCAPE '*' AND km.users_id = u.users_id AND km.string_id = str.string_id", + "u.login LIKE '%s' AND str.string LIKE '%s' AND km.users_id = u.users_id AND km.string_id = str.string_id", 2, - &VDwild2sort2, + "u.login, str.string", + NULL, }, { /* Q_AKUM - ADD_KERBEROS_USER_MAP */ "add_kerberos_user_map", "akum", + 2, APPEND, "k", - "krbmap", + KRBMAP_TABLE, "INTO krbmap (users_id, string_id) VALUES (%d, %d)", akum_fields, 2, 0, 0, + NULL, &akum_validate, }, @@ -2822,14 +4063,16 @@ struct query Queries2[] = { /* Q_DKUM - DELETE_KERBEROS_USER_MAP */ "delete_kerberos_user_map", "dkum", + 2, DELETE, "k", - "krbmap", + KRBMAP_TABLE, 0, akum_fields, 0, "users_id = %d AND string_id = %d", 2, + NULL, &dkum_validate, }, @@ -2837,14 +4080,16 @@ struct query Queries2[] = { /* Q_GFBL - GET_FINGER_BY_LOGIN */ "get_finger_by_login", "gfbl", + 2, RETRIEVE, "u", - USERS, - "CHAR(u.login), u.fullname, u.nickname, u.home_addr, u.home_phone, u.office_addr, u.office_phone, u.department, u.affiliation, CHAR(u.fmodtime), CHAR(u.fmodby), u.fmodwith FROM users u", + 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, - "u.users_id = %d", + "users_id = %d", 1, + "login", &gfbl_validate, }, @@ -2852,14 +4097,16 @@ struct query Queries2[] = { /* Q_UFBL - UPDATE_FINGER_BY_LOGIN */ "update_finger_by_login", "ufbl", + 2, 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, + NULL, &ufbl_validate, }, @@ -2867,14 +4114,16 @@ struct query Queries2[] = { /* Q_GPOB - GET_POBOX */ "get_pobox", "gpob", + 2, RETRIEVE, "u", - USERS, - "CHAR(u.login), u.potype, CHAR(u.pop_id) + ':' + CHAR(u.box_id), CHAR(u.pmodtime), CHAR(u.pmodby), u.pmodwith FROM users u", + USERS_TABLE, + "login, potype, users_id, CHR(0), TO_CHAR(pmodtime, 'DD-mon-YYYY HH24:MI:SS'), pmodby, pmodwith FROM users", gpob_fields, - 6, - "u.users_id = %d", + 7, + "users_id = %d", 1, + "login", &gpob_validate, }, @@ -2882,29 +4131,33 @@ struct query Queries2[] = { /* Q_GAPO - GET_ALL_POBOXES */ "get_all_poboxes", "gapo", + 2, RETRIEVE, "u", - USERS, - "CHAR(u.login), u.potype, CHAR(u.pop_id) + ':' + CHAR(u.box_id) FROM users u", + USERS_TABLE, + "login, potype, pop_id || ':' || box_id FROM users", gpox_fields, 3, - "u.potype != 'NONE'", + "potype != 'NONE'", 0, + "login", &gpox_validate, }, - + { /* Q_GPOP - GET_POBOXES_POP */ "get_poboxes_pop", "gpop", + 2, RETRIEVE, "u", - USERS, - "CHAR(u.login), u.potype, CHAR(u.pop_id) + ':' + CHAR(u.box_id) FROM users u", + USERS_TABLE, + "login, potype, users_id FROM users", gpox_fields, 3, - "u.potype = 'POP'", + "potype = 'POP'", 0, + "login", &gpox_validate }, @@ -2912,14 +4165,16 @@ struct query Queries2[] = { /* Q_GPOF - GET_POBOXES_SMTP */ "get_poboxes_smtp", "gpos", + 2, RETRIEVE, "u", - USERS, - "CHAR(u.login), u.potype, CHAR(u.pop_id) + ':' + CHAR(u.box_id) FROM users u", + USERS_TABLE, + "login, potype, users_id FROM users", gpox_fields, 3, - "u.potype = 'SMTP'", + "potype = 'SMTP'", 0, + "login", &gpox_validate }, @@ -2927,14 +4182,16 @@ struct query Queries2[] = { /* Q_SPOB - SET_POBOX */ "set_pobox", "spob", + 2, UPDATE, 0, - USERS, + USERS_TABLE, 0, spob_fields, 3, - (char *)0, + NULL, 0, + NULL, &spob_validate, }, @@ -2942,14 +4199,16 @@ struct query Queries2[] = { /* Q_SPOP - SET_POBOX_POP */ "set_pobox_pop", "spop", + 2, UPDATE, - "u", - USERS, - "users SET potype = 'POP'", - spob_fields, 0, - "users_id = %d", + USERS_TABLE, + 0, + spob_fields, 1, + NULL, + 0, + NULL, &spop_validate, }, @@ -2957,104 +4216,237 @@ struct query Queries2[] = { /* Q_DPOB - DELETE_POBOX */ "delete_pobox", "dpob", + 2, UPDATE, "u", - USERS, + USERS_TABLE, "users SET potype = 'NONE'", spob_fields, 0, "users_id = %d", 1, + NULL, &dpob_validate, }, { - /* Q_GMAC - GET_MACHINE */ - "get_machine", - "gmac", + /* Q_GHST - GET_HOST, v2 */ + "get_host", + "ghst", + 2, RETRIEVE, "m", - MACHINE, - "CHAR(m.name), m.vendor, CHAR(m.modtime), CHAR(m.modby), m.modwith FROM machine m", - gmac_fields, - 5, - "m.name LIKE '%s' ESCAPE '*' AND m.mach_id != 0", - 1, - &VDupwildsortf, + 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", + ghst2_fields, + 21, + "m.name LIKE UPPER('%s') AND m.address LIKE '%s' AND m.location LIKE UPPER('%s') AND s.name LIKE UPPER('%s') AND m.mach_id != 0 AND s.snet_id = m.snet_id", + 4, + "m.name", + &ghst_validate, }, { - /* Q_GHST - GET_HOST */ + /* Q_GHST - GET_HOST, v6 */ "get_host", "ghst", + 6, RETRIEVE, "m", - MACHINE, - "CHAR(m.name), m.vendor, m.model, m.os, m.location, m.contact, CHAR(m.use), CHAR(m.status), CHAR(m.statuschange), CHAR(s.name), m.address, m.owner_type, CHAR(m.owner_id), CHAR(m.acomment), CHAR(m.ocomment), CHAR(m.created), CHAR(m.creator), CHAR(m.inuse), CHAR(m.modtime), CHAR(m.modby), m.modwith FROM machine m, subnet s", + MACHINE_TABLE, + "m.name, m.vendor, m.model, m.os, m.location, m.contact, m.billing_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 m.contact LIKE '%s' ESCAPE '*' AND m.mach_id != 0 AND s.snet_id = m.snet_id", + 22, + "m.name LIKE UPPER('%s') AND m.address LIKE '%s' AND m.location LIKE UPPER('%s') AND s.name LIKE UPPER('%s') 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 */ + /* Q_GHBH - GET_HOST_BY_HWADDR, v2 */ + "get_host_by_hwaddr", + "ghbh", + 2, + 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", + ghbh2_fields, + 21, + "m.hwaddr LIKE LOWER('%s') AND m.mach_id != 0 AND s.snet_id = m.snet_id", + 1, + "m.name", + &ghst_validate, + }, + + { + /* Q_GHBH - GET_HOST_BY_HWADDR, v6 */ + "get_host_by_hwaddr", + "ghbh", + 6, + RETRIEVE, + "m", + MACHINE_TABLE, + "m.name, m.vendor, m.model, m.os, m.location, m.contact, m.billing_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", + ghbh_fields, + 22, + "m.hwaddr LIKE LOWER('%s') AND m.mach_id != 0 AND s.snet_id = m.snet_id", + 1, + "m.name", + &ghst_validate, + }, + + { + /* Q_GHHA - GET_HOST_HWADDR */ + "get_host_hwaddr", + "ghha", + 2, + RETRIEVE, + "m", + MACHINE_TABLE, + "m.hwaddr FROM machine m", + ghha_fields, + 1, + "m.name LIKE UPPER('%s')", + 1, + NULL, + NULL, + }, + + { + /* Q_AHST - ADD_HOST, v2 */ /* uses prefetch_value() for mach_id */ "add_host", "ahst", + 2, APPEND, "m", - MACHINE, - "INTO machine (name, vendor, model, os, location, contact, use, status, statuschange, snet_id, address, owner_type, owner_id, acomment, ocomment, created, inuse, mach_id, creator) VALUES (uppercase('%s'),uppercase('%s'),uppercase('%s'),uppercase('%s'),uppercase('%s'),'%s',%s,%s,date('now'),%d,'%s','%s',%d,%d,%d,date('now'),date('now'),%s,%s)", - ahst_fields, + 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)", + ahst2_fields, 14, 0, 0, + NULL, + &ahst2_validate, + }, + + { + /* Q_AHST - ADD_HOST, v6 */ /* uses prefetch_value() for mach_id */ + "add_host", + "ahst", + 6, + APPEND, + "m", + MACHINE_TABLE, + "INTO machine (name, vendor, model, os, location, contact, billing_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)), NVL('%s', CHR(0)), %s, %s, SYSDATE, %d, '%s', '%s', %d, %d, %d, SYSDATE, SYSDATE, %s, %s)", + ahst_fields, + 15, + 0, + 0, + NULL, &ahst_validate, }, { - /* Q_UHST - UPDATE_HOST */ + /* Q_UHST - UPDATE_HOST, v2 */ "update_host", "uhst", + 2, UPDATE, "m", - MACHINE, - "machine SET name=uppercase('%s'),vendor=uppercase('%s'),model=uppercase('%s'),os=uppercase('%s'),location=uppercase('%s'),contact='%s',use=%s,status=%s,snet_id=%d,address='%s',owner_type='%s',owner_id=%d,acomment=%d,ocomment=%d", - uhst_fields, + 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", + uhst2_fields, 14, "mach_id = %d", 1, + NULL, + &uhst2_validate, + }, + + { + /* Q_UHST - UPDATE_HOST, v6 */ + "update_host", + "uhst", + 6, + UPDATE, + "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)), billing_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, + 15, + "mach_id = %d", + 1, + NULL, &uhst_validate, }, + { + /* Q_UHHA - UPDATE_HOST_HWADDR */ + "update_host_hwaddr", + "uhha", + 2, + UPDATE, + "m", + MACHINE_TABLE, + "machine SET hwaddr = NVL('%s', CHR(0))", + uhha_fields, + 1, + "mach_id = %d", + 1, + NULL, + &uhha_validate, + }, + { /* Q_DHST - DELETE_HOST */ "delete_host", "dhst", + 2, DELETE, "m", - MACHINE, - (char *)0, + MACHINE_TABLE, + NULL, dhst_fields, 0, "mach_id = %d", 1, + NULL, &dhst_validate, }, + { + /* Q_GMAC - GET_MACHINE */ + "get_machine", + "gmac", + 2, + RETRIEVE, + "m", + MACHINE_TABLE, + "name, vendor, TO_CHAR(modtime, 'DD-mon-YYYY HH24:MI:SS'), modby, modwith FROM machine", + gmac_fields, + 5, + "name LIKE UPPER('%s') AND mach_id != 0", + 1, + "name", + &VDfix_modby, + }, + { /* Q_GHAL - GET_HOSTALIAS */ "get_hostalias", "ghal", + 2, RETRIEVE, "a", - "hostalias", - "CHAR(a.name), CHAR(m.name) FROM hostalias a, machine m", + 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 '*'", + "m.mach_id = a.mach_id and a.name LIKE UPPER('%s') AND m.name LIKE UPPER('%s')", 2, + "a.name", &ghal_validate, }, @@ -3062,14 +4454,16 @@ struct query Queries2[] = { /* Q_AHAL - ADD_HOSTALIAS */ "add_hostalias", "ahal", + 2, APPEND, "a", - "hostalias", - "INTO hostalias (name, mach_id) VALUES (uppercase('%s'),%d)", + HOSTALIAS_TABLE, + "INTO hostalias (name, mach_id) VALUES (UPPER('%s'), %d)", ghal_fields, 2, 0, 0, + NULL, &ahal_validate, }, @@ -3077,14 +4471,16 @@ struct query Queries2[] = { /* Q_DHAL - DELETE_HOSTALIAS */ "delete_hostalias", "dhal", + 2, DELETE, "a", - "hostalias", - (char *)0, + HOSTALIAS_TABLE, + NULL, ghal_fields, 0, - "name = uppercase('%s') AND mach_id = %d", + "name = UPPER('%s') AND mach_id = %d", 2, + NULL, &dhal_validate, }, @@ -3092,14 +4488,16 @@ struct query Queries2[] = { /* Q_GSNT - GET_SUBNET */ "get_subnet", "gsnt", + 2, RETRIEVE, "s", - SUBNET, - "CHAR(s.name), CHAR(s.description), CHAR(s.saddr), CHAR(s.mask), CHAR(s.low), CHAR(s.high), s.owner_type, CHAR(s.owner_id), CHAR(s.modtime), CHAR(s.modby), s.modwith FROM subnet s", + 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, - 11, - "s.name LIKE '%s' ESCAPE '*' and s.snet_id != 0", + 12, + "name LIKE UPPER('%s')", 1, + "name", &gsnt_validate, }, @@ -3107,14 +4505,16 @@ struct query Queries2[] = { /* Q_ASNT - ADD_SUBNET */ "add_subnet", "asnt", + 2, APPEND, "s", - SUBNET, - "INTO subnet (name, description, saddr, mask, low, high, owner_type, owner_id, snet_id) VALUES (uppercase('%s'), '%s', %s, %s, %s, %s, '%s', %d, %s)", + 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, - 8, + 9, 0, 0, + NULL, &asnt_validate, }, @@ -3122,194 +4522,611 @@ struct query Queries2[] = { /* Q_USNT - UPDATE_SUBNET */ "update_subnet", "usnt", + 2, UPDATE, "s", - SUBNET, - "subnet SET name=uppercase('%s'), description='%s', saddr=%s, mask=%s, low=%s, high=%s, owner_type='%s', owner_id=%d", + 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, - 8, + 9, "snet_id = %d", 1, + NULL, &usnt_validate, }, { - /* Q_DSNT - DELETE_SUBNET */ - "delete_subnet", - "dsnt", + /* Q_DSNT - DELETE_SUBNET */ + "delete_subnet", + "dsnt", + 2, + DELETE, + "s", + SUBNET_TABLE, + NULL, + dsnt_fields, + 0, + "snet_id = %d", + 1, + NULL, + &dsnt_validate, + }, + + { + /* Q_GCLU - GET_CLUSTER */ + "get_cluster", + "gclu", + 2, + RETRIEVE, + "c", + CLUSTERS_TABLE, + "name, description, location, TO_CHAR(modtime, 'DD-mon-YYYY HH24:MI:SS'), modby, modwith FROM clusters", + gclu_fields, + 6, + "name LIKE '%s' AND clu_id != 0", + 1, + "name", + &VDfix_modby, + }, + + { + /* Q_ACLU - ADD_CLUSTER */ /* uses prefetch_value() for clu_id */ + "add_cluster", + "aclu", + 2, + APPEND, + "c", + CLUSTERS_TABLE, + "INTO clusters (name, description, location, clu_id) VALUES ('%s', NVL('%s', CHR(0)), NVL('%s', CHR(0)), %s)", + aclu_fields, + 3, + 0, + 0, + NULL, + &aclu_validate, + }, + + { + /* Q_UCLU - UPDATE_CLUSTER */ + "update_cluster", + "uclu", + 2, + UPDATE, + "c", + CLUSTERS_TABLE, + "clusters SET name = '%s', description = NVL('%s', CHR(0)), location = NVL('%s', CHR(0))", + uclu_fields, + 3, + "clu_id = %d", + 1, + NULL, + &uclu_validate, + }, + + { + /* Q_DCLU - DELETE_CLUSTER */ + "delete_cluster", + "dclu", + 2, + DELETE, + "c", + CLUSTERS_TABLE, + NULL, + dclu_fields, + 0, + "clu_id = %d", + 1, + NULL, + &dclu_validate, + }, + + { + /* Q_GMCM - GET_MACHINE_TO_CLUSTER_MAP */ + "get_machine_to_cluster_map", + "gmcm", + 2, + RETRIEVE, + "mcm", + MCMAP_TABLE, + "m.name, c.name FROM machine m, clusters c, mcmap mcm", + gmcm_fields, + 2, + "m.name LIKE UPPER('%s') AND c.name LIKE '%s' AND mcm.clu_id = c.clu_id AND mcm.mach_id = m.mach_id", + 2, + "m.name", + NULL, + }, + + { + /* Q_AMTC - ADD_MACHINE_TO_CLUSTER */ + "add_machine_to_cluster", + "amtc", + 2, + APPEND, + "mcm", + MCMAP_TABLE, + "INTO mcmap (mach_id, clu_id) VALUES (%d, %d)", + gmcm_fields, + 2, + 0, + 0, + NULL, + &amtc_validate, + }, + + { + /* Q_DMFC - DELETE_MACHINE_FROM_CLUSTER */ + "delete_machine_from_cluster", + "dmfc", + 2, + DELETE, + "mcm", + MCMAP_TABLE, + 0, + gmcm_fields, + 0, + "mach_id = %d AND clu_id = %d", + 2, + NULL, + &amtc_validate, + }, + + { + /* Q_GCLD - GET_CLUSTER_DATA */ + "get_cluster_data", + "gcld", + 2, + RETRIEVE, + "svc", + SVC_TABLE, + "c.name, svc.serv_label, svc.serv_cluster FROM svc svc, clusters c", + gcld_fields, + 3, + "c.clu_id = svc.clu_id AND c.name LIKE '%s' AND svc.serv_label LIKE '%s'", + 2, + "c.name, svc.serv_label", + NULL, + }, + + { + /* Q_ACLD - ADD_CLUSTER_DATA */ + "add_cluster_data", + "acld", + 2, + APPEND, + "svc", + SVC_TABLE, + "INTO svc (clu_id, serv_label, serv_cluster) VALUES (%d, '%s', '%s')", + acld_fields, + 3, + NULL, + 0, + NULL, + &acld_validate, + }, + + { + /* Q_DCLD - DELETE_CLUSTER_DATA */ + "delete_cluster_data", + "dcld", + 2, + DELETE, + "svc", + SVC_TABLE, + NULL, + acld_fields, + 0, + "clu_id = %d AND serv_label = '%s' AND serv_cluster = '%s'", + 3, + NULL, + &dcld_validate, + }, + + { + /* Q_GLIN - GET_LIST_INFO, v2 */ + "get_list_info", + "glin", + 2, + RETRIEVE, + "l", + LIST_TABLE, + "name, active, publicflg, hidden, maillist, grouplist, gid, acl_type, acl_id, description, TO_CHAR(modtime, 'DD-mon-YYYY HH24:MI:SS'), modby, modwith FROM list", + glin2_fields, + 13, + "name LIKE '%s'", + 1, + "name", + &glin_validate, + }, + + { + /* Q_GLIN - GET_LIST_INFO, v3 */ + "get_list_info", + "glin", + 3, + RETRIEVE, + "l", + LIST_TABLE, + "name, active, publicflg, hidden, maillist, grouplist, gid, nfsgroup, acl_type, acl_id, description, TO_CHAR(modtime, 'DD-mon-YYYY HH24:MI:SS'), modby, modwith FROM list", + glin3_fields, + 14, + "name LIKE '%s'", + 1, + "name", + &glin_validate, + }, + + { + /* Q_GLIN - GET_LIST_INFO, v4 */ + "get_list_info", + "glin", + 4, + RETRIEVE, + "l", + LIST_TABLE, + "name, active, publicflg, hidden, maillist, grouplist, gid, nfsgroup, acl_type, acl_id, memacl_type, memacl_id, description, TO_CHAR(modtime, 'DD-mon-YYYY HH24:MI:SS'), modby, modwith FROM list", + glin_fields, + 16, + "name LIKE '%s'", + 1, + "name", + &glin_validate, + }, + + { + /* Q_EXLN - EXPAND_LIST_NAMES */ + "expand_list_names", + "exln", + 2, + RETRIEVE, + "l", + LIST_TABLE, + "name FROM list", + glin_fields, + 1, + "name LIKE '%s' AND list_id != 0", + 1, + "name", + NULL, + }, + + { + /* Q_ALIS - ADD_LIST, v2 */ /* uses prefetch_value() for list_id */ + "add_list", + "alis", + 2, + 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)", + alis2_fields, + 10, + 0, + 0, + NULL, + &alis2_validate, + }, + + { + /* Q_ALIS - ADD_LIST, v3 */ /* uses prefetch_value() for list_id */ + "add_list", + "alis", + 3, + APPEND, + "l", + LIST_TABLE, + "INTO list (name, active, publicflg, hidden, maillist, grouplist, gid, nfsgroup, acl_type, acl_id, description, list_id) VALUES ('%s', %s, %s, %s, %s, %s, %s, %s, '%s', %d, NVL('%s', CHR(0)), %s)", + alis3_fields, + 11, + 0, + 0, + NULL, + &alis3_validate, + }, + + { + /* Q_ALIS - ADD_LIST, v4 */ /* uses prefetch_value() for list_id */ + "add_list", + "alis", + 4, + APPEND, + "l", + LIST_TABLE, + "INTO list (name, active, publicflg, hidden, maillist, grouplist, gid, nfsgroup, acl_type, acl_id, memacl_type, memacl_id, description, list_id) VALUES ('%s', %s, %s, %s, %s, %s, %s, %s, '%s', %d, '%s', %d, NVL('%s', CHR(0)), %s)", + alis_fields, + 13, + 0, + 0, + NULL, + &alis_validate, + }, + + { + /* Q_ULIS - UPDATE_LIST, v2 */ + "update_list", + "ulis", + 2, + 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))", + ulis2_fields, + 10, + "list_id = %d", + 1, + NULL, + &ulis2_validate, + }, + + { + /* Q_ULIS - UPDATE_LIST, v3 */ + "update_list", + "ulis", + 3, + UPDATE, + "l", + LIST_TABLE, + "list SET name = '%s', active = %s, publicflg = %s, hidden = %s, maillist = %s, grouplist = %s, gid = %s, nfsgroup = %s, acl_type = '%s', acl_id = %d, description = NVL('%s', CHR(0))", + ulis3_fields, + 11, + "list_id = %d", + 1, + NULL, + &ulis3_validate, + }, + + { + /* Q_ULIS, UPDATE_LIST, v4 */ + "update_list", + "ulis", + 4, + UPDATE, + "l", + LIST_TABLE, + "list SET name = '%s', active = %s, publicflg = %s, hidden = %s, maillist = %s, grouplist = %s, gid = %s, nfsgroup = %s, acl_type = '%s', acl_id = %d, memacl_type = '%s', memacl_id = %d, description = NVL('%s', CHR(0))", + ulis_fields, + 13, + "list_id = %d", + 1, + NULL, + &ulis_validate, + }, + + { + /* Q_DLIS - DELETE_LIST */ + "delete_list", + "dlis", + 2, DELETE, - "s", - SUBNET, - (char *)0, - dsnt_fields, + "l", + LIST_TABLE, + NULL, + dlis_fields, 0, - "snet_id = %d", + "list_id = %d", 1, - &dsnt_validate, + NULL, + &dlis_validate, }, { - /* Q_GCLU - GET_CLUSTER */ - "get_cluster", - "gclu", - RETRIEVE, - "c", - CLUSTER, - "CHAR(c.name), c.description, c.location, CHAR(c.modtime), CHAR(c.modby), c.modwith FROM cluster c", - gclu_fields, - 6, - "c.name LIKE '%s' ESCAPE '*' AND c.clu_id != 0", - 1, - &VDwildsortf, + /* Q_AMTL - ADD_MEMBER_TO_LIST */ + "add_member_to_list", + "amtl", + 2, + APPEND, + 0, + IMEMBERS_TABLE, + 0, + amtl_fields, + 3, + NULL, + 0, + NULL, + &amtl_validate, }, { - /* Q_ACLU - ADD_CLUSTER */ /* uses prefetch_value() for clu_id */ - "add_cluster", - "aclu", + /* Q_ATML - ADD_TAGGED_MEMBER_TO_LIST */ + "add_tagged_member_to_list", + "atml", + 2, APPEND, - "c", - CLUSTER, - "INTO cluster (name, description, location, clu_id) VALUES ('%s','%s','%s',%s)", - aclu_fields, - 3, 0, + IMEMBERS_TABLE, 0, - &aclu_validate, + atml_fields, + 4, + NULL, + 0, + NULL, + &atml_validate, }, { - /* Q_UCLU - UPDATE_CLUSTER */ - "update_cluster", - "uclu", + /* Q_TMOL - TAG_MEMBER_OF_LIST */ + "tag_member_of_list", + "tmol", + 2, UPDATE, - "c", - CLUSTER, - "cluster SET name = '%s', description = '%s', location = '%s'", - uclu_fields, - 3, - "clu_id = %d", + 0, + IMEMBERS_TABLE, + 0, + atml_fields, 1, - &uclu_validate, + 0, + 3, + NULL, + &tmol_validate, }, { - /* Q_DCLU - DELETE_CLUSTER */ - "delete_cluster", - "dclu", + /* Q_DMFL - DELETE_MEMBER_FROM_LIST */ + "delete_member_from_list", + "dmfl", + 2, DELETE, - "c", - CLUSTER, - (char *)0, - dclu_fields, 0, - "clu_id = %d", - 1, - &dclu_validate, + IMEMBERS_TABLE, + NULL, + amtl_fields, + 0, + 0, + 3, + NULL, + &dmfl_validate, }, { - /* Q_GMCM - GET_MACHINE_TO_CLUSTER_MAP */ - "get_machine_to_cluster_map", - "gmcm", + /* Q_GAUS - GET_ACE_USE */ + "get_ace_use", + "gaus", + 2, RETRIEVE, - "mcm", - "mcmap", - "CHAR(m.name), CHAR(c.name) FROM machine m, cluster c, mcmap mcm", - gmcm_fields, + 0, + 0, + 0, + gaus_fields, 2, - "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", + 0, 2, - &gmcm_validate, + NULL, + &gaus_validate, }, - + { - /* Q_AMTC - ADD_MACHINE_TO_CLUSTER */ - "add_machine_to_cluster", - "amtc", - APPEND, - "mcm", - "mcmap", - "INTO mcmap (mach_id, clu_id) VALUES (%d, %d)", - gmcm_fields, + /* Q_GHBO - GET_HOST_BY_OWNER */ + "get_host_by_owner", + "ghbo", 2, + RETRIEVE, 0, 0, - &amtc_validate, + 0, + ghbo_fields, + 1, + 0, + 2, + NULL, + &ghbo_validate, }, { - /* Q_DMFC - DELETE_MACHINE_FROM_CLUSTER */ - "delete_machine_from_cluster", - "dmfc", - DELETE, - "mcm", - "mcmap", + /* Q_QGLI - QUALIFIED_GET_LISTS */ + "qualified_get_lists", + "qgli", + 2, + RETRIEVE, 0, - gmcm_fields, + LIST_TABLE, 0, - "mach_id = %d AND clu_id = %d", + qgli_fields, + 1, + 0, + 5, + NULL, + &qgli_validate, + }, + + { + /* Q_GMOL - GET_MEMBERS_OF_LIST */ + "get_members_of_list", + "gmol", 2, - &amtc_validate, + RETRIEVE, + NULL, + IMEMBERS_TABLE, + NULL, + gmol_fields, + 2, + NULL, + 1, + NULL, + &gmol_validate, }, { - /* Q_GCLD - GET_CLUSTER_DATA */ - "get_cluster_data", - "gcld", + /* Q_GEML - GET_END_MEMBERS_OF_LIST */ + "get_end_members_of_list", + "geml", + 2, RETRIEVE, - "svc", - "svc", - "CHAR(c.name), CHAR(svc.serv_label), svc.serv_cluster FROM svc svc, cluster c", - gcld_fields, - 3, - "c.clu_id = svc.clu_id AND c.name LIKE '%s' ESCAPE '*' AND svc.serv_label LIKE '%s' ESCAPE '*'", + NULL, + IMEMBERS_TABLE, + NULL, + gmol_fields, 2, - &VDwild2sort2, + NULL, + 1, + NULL, + &gmol_validate, }, { - /* Q_ACLD - ADD_CLUSTER_DATA */ - "add_cluster_data", - "acld", - APPEND, - "svc", - "svc", - "INTO svc (clu_id, serv_label, serv_cluster) VALUES (%d,'%s','%s')", - acld_fields, + /* Q_GTML - GET_TAGGED_MEMBERS_OF_LIST */ + "get_tagged_members_of_list", + "gtml", + 2, + RETRIEVE, + NULL, + IMEMBERS_TABLE, + NULL, + gtml_fields, 3, - (char *)0, + NULL, + 1, + NULL, + &gmol_validate, + }, + + { + /* Q_GLOM - GET_LISTS_OF_MEMBER */ + "get_lists_of_member", + "glom", + 2, + RETRIEVE, 0, - &acld_validate, + IMEMBERS_TABLE, + 0, + glom_fields, + 6, + 0, + 2, + NULL, + &glom_validate, }, { - /* Q_DCLD - DELETE_CLUSTER_DATA */ - "delete_cluster_data", - "dcld", - DELETE, - "svc", - "svc", - (char *)0, - acld_fields, + /* Q_CMOL - COUNT_MEMBERS_OF_LIST */ + "count_members_of_list", + "cmol", + 2, + RETRIEVE, 0, - "clu_id = %d AND serv_label = '%s' AND serv_cluster = '%s'", - 3, - &dcld_validate, + IMEMBERS_TABLE, + 0, + cmol_fields, + 1, + 0, + 1, + NULL, + &cmol_validate, }, { /* Q_GSIN - GET_SERVER_INFO */ "get_server_info", "gsin", + 2, RETRIEVE, "s", - "servers", - "CHAR(s.name), CHAR(s.update_int), s.target_file, s.script, CHAR(s.dfgen), CHAR(s.dfcheck), s.type, CHAR(s.enable), CHAR(s.inprogress), CHAR(s.harderror), s.errmsg, s.acl_type, CHAR(s.acl_id), CHAR(s.modtime), CHAR(s.modby), s.modwith FROM servers s", + 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, - "s.name LIKE '%s' ESCAPE '*'", + "name LIKE UPPER('%s')", 1, + "name", &gsin_validate, }, @@ -3317,14 +5134,16 @@ struct query Queries2[] = { /* Q_QGSV - QUALIFIED_GET_SERVER */ "qualified_get_server", "qgsv", + 2, RETRIEVE, 0, - "servers", + SERVERS_TABLE, 0, qgsv_fields, 1, 0, 3, + NULL, &qgsv_validate, }, @@ -3332,14 +5151,16 @@ struct query Queries2[] = { /* Q_ASIN - ADD_SERVER_INFO */ "add_server_info", "asin", + 2, 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, + NULL, 0, + NULL, &asin_validate, }, @@ -3347,14 +5168,16 @@ struct query Queries2[] = { /* Q_USIN - UPDATE_SERVER_INFO */ "update_server_info", "usin", + 2, 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, + NULL, &asin_validate, }, @@ -3362,14 +5185,16 @@ struct query Queries2[] = { /* Q_RSVE - RESET_SERVER_ERROR */ "reset_server_error", "rsve", + 2, UPDATE, "s", - "servers", + SERVERS_TABLE, "servers SET harderror = 0, dfcheck = dfgen", dsin_fields, 0, - "name = uppercase('%s')", + "name = UPPER('%s')", 1, + NULL, &rsve_validate, }, @@ -3377,14 +5202,16 @@ struct query Queries2[] = { /* Q_SSIF - SET_SERVER_INTERNAL_FLAGS */ "set_server_internal_flags", "ssif", + 2, 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, + NULL, &ssif_validate, }, @@ -3392,29 +5219,33 @@ struct query Queries2[] = { /* Q_DSIN - DELETE_SERVER_INFO */ "delete_server_info", "dsin", + 2, DELETE, "s", - "servers", - (char *)0, + SERVERS_TABLE, + NULL, dsin_fields, 0, - "name = uppercase('%s')", + "name = UPPER('%s')", 1, + NULL, &dsin_validate, }, { - /* Q_GSHI - GET_SERVER_HOST_INFO */ + /* Q_GSHI - GET_SERVER_HOST_INFO */ "get_server_host_info", "gshi", + 2, RETRIEVE, "sh", - "serverhosts", - "CHAR(sh.service), CHAR(m.name), CHAR(sh.enable), CHAR(sh.override), CHAR(sh.success), CHAR(sh.inprogress), CHAR(sh.hosterror), sh.hosterrmsg, CHAR(sh.ltt), CHAR(sh.lts), CHAR(sh.value1), CHAR(sh.value2), sh.value3, CHAR(sh.modtime), CHAR(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 LIKE '%s' ESCAPE '*' AND m.name LIKE '%s' ESCAPE '*' AND m.mach_id = sh.mach_id", + "sh.service LIKE UPPER('%s') AND m.name LIKE UPPER('%s') AND m.mach_id = sh.mach_id", 2, + "sh.service, m.name", &gshi_validate, }, @@ -3422,14 +5253,16 @@ struct query Queries2[] = { /* Q_QGSH - QUALIFIED_GET_SERVER_HOST */ "qualified_get_server_host", "qgsh", + 2, RETRIEVE, 0, - "serverhosts", + SERVERHOSTS_TABLE, 0, qgsh_fields, 2, 0, 6, + NULL, &qgsh_validate, }, @@ -3437,14 +5270,16 @@ struct query Queries2[] = { /* Q_ASHI - ADD_SERVER_HOST_INFO */ "add_server_host_info", "ashi", + 2, 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, + NULL, 0, + NULL, &ashi_validate, }, @@ -3452,14 +5287,16 @@ struct query Queries2[] = { /* Q_USHI - UPDATE_SERVER_HOST_INFO */ "update_server_host_info", "ushi", + 2, 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, + NULL, &ashi_validate, }, @@ -3467,14 +5304,16 @@ struct query Queries2[] = { /* Q_RSHE - RESET_SERVER_HOST_ERROR */ "reset_server_host_error", "rshe", + 2, 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, + NULL, &rshe_validate, }, @@ -3482,14 +5321,16 @@ struct query Queries2[] = { /* Q_SSHO - SET_SERVER_HOST_OVERRIDE */ "set_server_host_override", "ssho", + 2, 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, + NULL, &ssho_validate, }, @@ -3497,164 +5338,118 @@ struct query Queries2[] = { /* 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", - sshi_fields, - 7, - "service = uppercase('%s') AND mach_id = %d", - 2, - &sshi_validate, - }, - - { - /* Q_DSHI - DELETE_SERVER_HOST_INFO */ - "delete_server_host_info", - "dshi", - DELETE, - "sh", - "serverhosts", - (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", - "CHAR(m.name), ha.acl_type, CHAR(ha.acl_id), CHAR(ha.modtime), CHAR(ha.modby), ha.modwith FROM hostaccess ha, machine m", - gsha_fields, - 6, - "m.name LIKE '%s' ESCAPE '*' 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, + UPDATE, + "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, + "service = UPPER('%s') AND mach_id = %d", 2, - "mach_id = %d", - 1, - &asha_validate, + NULL, + &sshi_validate, }, { - /* Q_DSHA - DELETE_SERVER_HOST_ACCESS */ - "delete_server_host_access", - "dsha", + /* Q_DSHI - DELETE_SERVER_HOST_INFO */ + "delete_server_host_info", + "dshi", + 2, DELETE, - "ha", - "hostaccess", - 0, - asha_fields, + "sh", + SERVERHOSTS_TABLE, + NULL, + dshi_fields, 0, - "mach_id = %d", - 1, - &VDmach, + "service = UPPER('%s') AND mach_id = %d", + 2, + NULL, + &dshi_validate, }, { - /* Q_GSLO - GET_SERVER_LOCATIONS */ + /* Q_GSLO - GET_SERVER_LOCATIONS */ "get_server_locations", "gslo", + 2, RETRIEVE, "sh", - "serverhosts", - "CHAR(sh.service), CHAR(m.name) FROM serverhosts sh, machine m", + SERVERHOSTS_TABLE, + "sh.service, m.name FROM serverhosts sh, machine m", gslo_fields, 2, - "sh.service LIKE '%s' ESCAPE '*' AND sh.mach_id = m.mach_id", + "sh.service LIKE UPPER('%s') AND sh.mach_id = m.mach_id", 1, - &VDupwild0, + "sh.service, m.name", + NULL, }, { - /* Q_GFSL - GET_FILESYS_BY_LABEL */ + /* Q_GFSL - GET_FILESYS_BY_LABEL */ "get_filesys_by_label", "gfsl", + 2, RETRIEVE, "fs", - FILESYS, - "CHAR(fs.label), fs.type, CHAR(m.name), CHAR(fs.name), fs.mount, fs.access, fs.comments, CHAR(u.login), CHAR(l.name), CHAR(fs.createflg), fs.lockertype, CHAR(fs.modtime), CHAR(fs.modby), fs.modwith FROM filesys fs, machine m, users u, list l", + 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 LIKE '%s' ESCAPE '*' AND fs.mach_id = m.mach_id AND fs.owner = u.users_id AND fs.owners = l.list_id", + "fs.label LIKE '%s' AND fs.mach_id = m.mach_id AND fs.owner = u.users_id AND fs.owners = l.list_id", 1, - &VDwildsortf, + "fs.label", + &gfsl_validate, }, { - /* Q_GFSM - GET_FILESYS_BY_MACHINE */ + /* Q_GFSM - GET_FILESYS_BY_MACHINE */ "get_filesys_by_machine", "gfsm", + 2, RETRIEVE, "fs", - FILESYS, - "CHAR(fs.label), fs.type, CHAR(m.name), CHAR(fs.name), fs.mount, fs.access, fs.comments, CHAR(u.login), CHAR(l.name), CHAR(fs.createflg), fs.lockertype, CHAR(fs.modtime), CHAR(fs.modby), fs.modwith FROM filesys fs, machine m, users u, list l", + 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, }, { - /* Q_GFSN - GET_FILESYS_BY_NFSPHYS */ + /* Q_GFSN - GET_FILESYS_BY_NFSPHYS */ "get_filesys_by_nfsphys", "gfsn", + 2, RETRIEVE, "fs", - FILESYS, - "CHAR(fs.label), fs.type, CHAR(m.name), CHAR(fs.name), fs.mount, fs.access, fs.comments, CHAR(u.login), CHAR(l.name), CHAR(fs.createflg), fs.lockertype, CHAR(fs.modtime), CHAR(fs.modby), fs.modwith FROM filesys fs, machine m, users u, list l, nfsphys np", + 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 LIKE '%s' ESCAPE '*' 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'", 2, + "fs.label", &gfsn_validate, }, { - /* Q_GFSG - GET_FILESYS_BY_GROUP */ + /* Q_GFSG - GET_FILESYS_BY_GROUP */ "get_filesys_by_group", "gfsg", + 2, RETRIEVE, "fs", - FILESYS, - "CHAR(fs.label), fs.type, CHAR(m.name), CHAR(fs.name), fs.mount, fs.access, fs.comments, CHAR(u.login), CHAR(l.name), CHAR(fs.createflg), fs.lockertype, CHAR(fs.modtime), CHAR(fs.modby), fs.modwith FROM filesys fs, machine m, users u, list l", + 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, }, @@ -3662,29 +5457,33 @@ struct query Queries2[] = { /* Q_GFSP - GET_FILESYS_BY_PATH */ "get_filesys_by_path", "gfsp", + 2, RETRIEVE, "fs", - FILESYS, - "CHAR(fs.label), fs.type, CHAR(m.name), CHAR(fs.name), fs.mount, fs.access, fs.comments, CHAR(u.login), CHAR(l.name), CHAR(fs.createflg), fs.lockertype, CHAR(fs.modtime), CHAR(fs.modby), fs.modwith FROM filesys fs, machine m, users u, list l", + 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", + "fs.name LIKE '%s' AND m.mach_id = fs.mach_id AND fs.owner = u.users_id AND fs.owners = list_id", 1, - &VDwildsortf, + "fs.label", + &VDfix_modby, }, - + { /* Q_AFIL - ADD_FILESYS */ /* uses prefetch_value() for filsys_id */ "add_filesys", "afil", + 2, APPEND, "fs", - FILESYS, - "INTO filesys (label, type, mach_id, name, mount, access, comments, owner, owners, createflg, lockertype, filsys_id) VALUES ('%s','%s',%d,'%s','%s','%s','%s',%d,%d,%s,'%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)), NVL('%s', CHR(0)), '%s', NVL('%s', CHR(0)), %d, %d, %s, '%s', %s)", afil_fields, 11, 0, 0, + NULL, &afil_validate, }, @@ -3692,44 +5491,50 @@ struct query Queries2[] = { /* Q_UFIL - UPDATE_FILESYS */ "update_filesys", "ufil", + 2, 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 = NVL('%s', CHR(0)), rwaccess = '%s', comments = NVL('%s', CHR(0)), owner = %d, owners = %d, createflg = %s, lockertype = '%s'", ufil_fields, 11, "filsys_id = %d", 1, - &ufil_validate, + NULL, + &ufil_validate, }, { /* Q_DFIL - DELETE_FILESYS */ "delete_filesys", "dfil", + 2, DELETE, "fs", - FILESYS, - (char *)0, + FILESYS_TABLE, + NULL, dfil_fields, 0, "filsys_id = %d", 1, + NULL, &dfil_validate, }, { - /* Q_GFGM - GET_FSGROUP_MEMBERS */ + /* Q_GFGM - GET_FSGROUP_MEMBERS */ "get_fsgroup_members", "gfgm", + 2, RETRIEVE, "fg", - "fsgroup", - "CHAR(fs.label), fg.key FROM fsgroup fg, filesys fs", + 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, + "fs.label, fg.key", &gfgm_validate, }, @@ -3737,14 +5542,16 @@ struct query Queries2[] = { /* Q_AFTG - ADD_FILESYS_TO_FSGROUP */ "add_filesys_to_fsgroup", "aftg", + 2, APPEND, "fg", - "fsgroup", - "INTO fsgroup (group_id,filsys_id,key) VALUES (%d, %d, '%s')", + FSGROUP_TABLE, + "INTO fsgroup (group_id, filsys_id, key) VALUES (%d, %d, '%s')", gfgm_fields, 3, - (char *)0, + NULL, 0, + NULL, &aftg_validate, }, @@ -3752,44 +5559,50 @@ struct query Queries2[] = { /* Q_RFFG - REMOVE_FILESYS_FROM_FSGROUP */ "remove_filesys_from_fsgroup", "rffg", + 2, DELETE, "fg", - "fsgroup", - (char *)0, + FSGROUP_TABLE, + NULL, gfgm_fields, 0, "group_id = %d AND filsys_id = %d", 2, + NULL, &aftg_validate, }, { - /* Q_GANF - GET_ALL_NFSPHYS */ + /* Q_GANF - GET_ALL_NFSPHYS */ "get_all_nfsphys", "ganf", + 2, RETRIEVE, "np", - "nfsphys", - "CHAR(m.name), CHAR(np.dir), np.device, CHAR(np.status), CHAR(np.allocated), CHAR(np.partsize), CHAR(np.modtime), CHAR(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", + &VDfix_modby, }, { - /* Q_GNFP - GET_NFSPHYS */ + /* Q_GNFP - GET_NFSPHYS */ "get_nfsphys", "gnfp", + 2, RETRIEVE, "np", - "nfsphys", - "CHAR(m.name), CHAR(np.dir), np.device, CHAR(np.status), CHAR(np.allocated), CHAR(np.partsize), CHAR(np.modtime), CHAR(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 LIKE '%s' ESCAPE '*' AND m.mach_id = np.mach_id", + "np.mach_id = %d AND np.dir LIKE '%s' AND m.mach_id = np.mach_id", 2, + "m.name, np.dir", &gnfp_validate, }, @@ -3797,14 +5610,16 @@ struct query Queries2[] = { /* Q_ANFP - ADD_NFSPHYS */ /* uses prefetch_value() for nfsphys_id */ "add_nfsphys", "anfp", + 2, APPEND, "np", - "nfsphys", - "INTO nfsphys (mach_id, dir, device, status, allocated, partsize, nfsphys_id) VALUES (%d, '%s', '%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, 0, 0, + NULL, &anfp_validate, }, @@ -3812,14 +5627,16 @@ struct query Queries2[] = { /* Q_UNFP - UPDATE_NFSPHYS */ "update_nfsphys", "unfp", + 2, UPDATE, "np", - "nfsphys", - "nfsphys SET device = '%s', status = %s, allocated = %s, partsize = %s", + 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, + NULL, &unfp_validate, }, @@ -3827,59 +5644,67 @@ struct query Queries2[] = { /* Q_AJNF - ADJUST_NFSPHYS_ALLOCATION */ "adjust_nfsphys_allocation", "ajnf", + 2, UPDATE, "np", - "nfsphys", + NFSPHYS_TABLE, "nfsphys SET allocated = allocated + %s", ajnf_fields, 1, "mach_id = %d AND dir = '%s'", 2, - &unfp_validate, + NULL, + &ajnf_validate, }, { /* Q_DNFP - DELETE_NFSPHYS */ "delete_nfsphys", "dnfp", + 2, DELETE, "np", - "nfsphys", - (char *)0, + NFSPHYS_TABLE, + NULL, dnfp_fields, 0, "mach_id = %d AND dir = '%s'", 2, + NULL, &dnfp_validate, }, { - /* Q_GQOT - GET_QUOTA */ + /* Q_GQOT - GET_QUOTA */ "get_quota", "gqot", + 2, RETRIEVE, "q", - QUOTA, - "CHAR(fs.label), q.type, CHAR(q.entity_id), CHAR(q.quota), CHAR(q.phys_id), CHAR(m.name), CHAR(q.modtime), CHAR(q.modby), q.modwith FROM quota q, filesys fs, machine m", + 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", + "fs.label LIKE '%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, + NULL, &gqot_validate, }, { - /* Q_GQBF - GET_QUOTA_BY_FILESYS */ + /* Q_GQBF - GET_QUOTA_BY_FILESYS */ "get_quota_by_filesys", "gqbf", + 2, RETRIEVE, "q", - QUOTA, - "CHAR(fs.label), q.type, CHAR(q.entity_id), CHAR(q.quota), CHAR(q.phys_id), CHAR(m.name), CHAR(q.modtime), CHAR(q.modby), q.modwith FROM quota q, filesys fs, machine m", + 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", + "fs.label LIKE '%s' AND fs.filsys_id = q.filsys_id AND m.mach_id = fs.mach_id", 1, + "fs.label, q.type", &gqbf_validate, }, @@ -3887,14 +5712,16 @@ struct query Queries2[] = { /* Q_AQOT - ADD_QUOTA */ /* prefetch_filsys() gets last 1 value */ "add_quota", "aqot", + 2, APPEND, 0, - QUOTA, + QUOTA_TABLE, "INTO quota (filsys_id, type, entity_id, quota, phys_id) VALUES ('%s', %d, %d, %s, %s)", aqot_fields, 4, - (char *)0, + NULL, 0, + NULL, &aqot_validate, }, @@ -3902,14 +5729,16 @@ struct query Queries2[] = { /* Q_UQOT - UPDATE_QUOTA */ "update_quota", "uqot", + 2, UPDATE, 0, - QUOTA, + QUOTA_TABLE, "quota SET quota = %s", aqot_fields, 1, 0, 3, + NULL, &uqot_validate, }, @@ -3917,74 +5746,84 @@ struct query Queries2[] = { /* Q_DQOT - DELETE_QUOTA */ "delete_quota", "dqot", + 2, DELETE, 0, - QUOTA, - (char *)0, + QUOTA_TABLE, + NULL, aqot_fields, 0, 0, 3, + NULL, &dqot_validate, }, { - /* Q_GNFQ - GET_NFS_QUOTAS */ + /* Q_GNFQ - GET_NFS_QUOTAS */ "get_nfs_quota", "gnfq", + 2, RETRIEVE, "q", - QUOTA, - "CHAR(fs.label), CHAR(u.login), CHAR(q.quota), CHAR(q.phys_id), CHAR(m.name), CHAR(q.modtime), CHAR(q.modby), q.modwith FROM quota q, filesys fs, users u, machine m", + 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'", + "fs.label LIKE '%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, + "fs.label, u.login", &gnfq_validate, }, { - /* Q_GNQP - GET_NFS_QUOTAS_BY_PARTITION */ + /* Q_GNQP - GET_NFS_QUOTAS_BY_PARTITION */ "get_nfs_quotas_by_partition", "gnqp", + 2, RETRIEVE, "q", - QUOTA, - "CHAR(fs.label), CHAR(u.login), CHAR(q.quota), CHAR(np.dir), CHAR(m.name) FROM quota q, filesys fs, users u, nfsphys np, machine m", + 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, - "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", + "np.mach_id = %d AND np.dir LIKE '%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, - &gnqp_validate, + "fs.label", + NULL, }, { /* Q_ANFQ - ADD_NFS_QUOTA */ /* prefetch_filsys() gets last 1 value */ "add_nfs_quota", "anfq", + 2, APPEND, 0, - QUOTA, + QUOTA_TABLE, "INTO quota (type, filsys_id, entity_id, quota, phys_id ) VALUES ('USER', %d, %d, %s, %s)", anfq_fields, 3, - (char *)0, + NULL, 0, + NULL, &anfq_validate, }, { - /* Q_UNFQ - UPDATE_NFS_QUOTA */ + /* Q_UNFQ - UPDATE_NFS_QUOTA */ "update_nfs_quota", "unfq", + 2, UPDATE, 0, - QUOTA, + QUOTA_TABLE, "quota SET quota = %s", anfq_fields, 1, 0, 2, + NULL, &unfq_validate, }, @@ -3992,299 +5831,288 @@ struct query Queries2[] = { /* Q_DNFQ - DELETE_NFS_QUOTA */ "delete_nfs_quota", "dnfq", + 2, DELETE, 0, - QUOTA, - (char *)0, + QUOTA_TABLE, + NULL, anfq_fields, 0, 0, 2, + NULL, &dnfq_validate, }, { - /* Q_GLIN - GET_LIST_INFO */ - "get_list_info", - "glin", + /* Q_GZCL - GET_ZEPHYR_CLASS, v2 */ + "get_zephyr_class", + "gzcl", + 2, RETRIEVE, - 0, - LIST, - 0, - glin_fields, - 13, - 0, - 1, - &glin_validate, + "z", + 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", + gzcl2_fields, + 12, + "class LIKE '%s'", + 1, + "class", + &gzcl_validate, }, - + { - /* Q_EXLN - EXPAND_LIST_NAMES */ - "expand_list_names", - "exln", + /* Q_GZCL - GET_ZEPHYR_CLASS, v5 */ + "get_zephyr_class", + "gzcl", + 5, RETRIEVE, - "l", - LIST, - "CHAR(l.name) FROM list l", - glin_fields, - 1, - "l.name LIKE '%s' ESCAPE '*' AND l.list_id != 0", + "z", + ZEPHYR_TABLE, + "class, xmt_type, xmt_id, sub_type, sub_id, iws_type, iws_id, iui_type, iui_id, owner_type, owner_id, TO_CHAR(modtime, 'DD-mon-YYYY HH24:MI:SS'), modby, modwith FROM zephyr", + gzcl_fields, + 14, + "class LIKE '%s'", 1, - &VDwild0, + "class", + &gzcl_validate, }, - + { - /* Q_ALIS - ADD_LIST */ /* uses prefetch_value() for list_id */ - "add_list", - "alis", + /* Q_AZCL - ADD_ZEPHYR_CLASS, v2 */ + "add_zephyr_class", + "azcl", + 2, APPEND, - "l", - LIST, - "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,'%s',%s)", - alis_fields, - 10, + "z", + 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)", + azcl2_fields, + 9, 0, 0, - &alis_validate, + NULL, + &azcl2_validate, }, { - /* Q_ULIS - UPDATE_LIST */ - "update_list", - "ulis", - UPDATE, - "l", - LIST, - "list SET name='%s', active=%s, publicflg=%s, hidden=%s, maillist=%s, grouplist=%s, gid=%s, acl_type='%s', acl_id=%d, description='%s'", - ulis_fields, - 10, - "list_id = %d", - 1, - &ulis_validate, + /* Q_AZCL - ADD_ZEPHYR_CLASS, v5 */ + "add_zephyr_class", + "azcl", + 5, + APPEND, + "z", + ZEPHYR_TABLE, + "INTO zephyr (class, xmt_type, xmt_id, sub_type, sub_id, iws_type, iws_id, iui_type, iui_id, owner_type, owner_id) VALUES ('%s', '%s', %d, '%s', %d, '%s', %d, '%s', %d, '%s', %d)", + azcl_fields, + 11, + 0, + 0, + NULL, + &azcl_validate, }, { - /* Q_DLIS - DELETE_LIST */ - "delete_list", - "dlis", - DELETE, - "l", - LIST, - (char *)0, - dlis_fields, - 0, - "list_id = %d", + /* Q_UZCL - UPDATE_ZEPHYR_CLASS, v2 */ + "update_zephyr_class", + "uzcl", + 2, + UPDATE, + "z", + 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", + uzcl2_fields, + 9, + "class = '%s'", 1, - &dlis_validate, + NULL, + &uzcl2_validate, }, { - /* Q_AMTL - ADD_MEMBER_TO_LIST */ - "add_member_to_list", - "amtl", - APPEND, - 0, - "imembers", - 0, - amtl_fields, - 3, - (char *)0, - 0, - &amtl_validate, + /* Q_UZCL - UPDATE_ZEPHYR_CLASS, v5 */ + "update_zephyr_class", + "uzcl", + 5, + UPDATE, + "z", + 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, owner_type = '%s', owner_id = %d", + uzcl_fields, + 11, + "class = '%s'", + 1, + NULL, + &uzcl_validate, }, { - /* Q_DMFL - DELETE_MEMBER_FROM_LIST */ - "delete_member_from_list", - "dmfl", + /* Q_DZCL - DELETE_ZEPHYR_CLASS */ + "delete_zephyr_class", + "dzcl", + 2, DELETE, + "z", + ZEPHYR_TABLE, 0, - "imembers", - (char *)0, - amtl_fields, - 0, + uzcl_fields, 0, - 3, - &dmfl_validate, + "class = '%s'", + 1, + NULL, + &dzcl_validate, }, { - /* Q_GAUS - GET_ACE_USE */ - "get_ace_use", - "gaus", - RETRIEVE, - 0, - 0, - 0, - gaus_fields, - 2, - 0, + /* Q_GSHA - GET_SERVER_HOST_ACCESS */ + "get_server_host_access", + "gsha", 2, - &gaus_validate, + 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 UPPER('%s') AND ha.mach_id = m.mach_id", + 1, + "m.name", + &gsha_validate, }, { - /* Q_QGLI - QUALIFIED_GET_LISTS */ - "qualified_get_lists", - "qgli", - RETRIEVE, - 0, - LIST, + /* Q_ASHA - ADD_SERVER_HOST_ACCESS */ + "add_server_host_access", + "asha", + 2, + APPEND, + "ha", + HOSTACCESS_TABLE, + "INTO hostaccess (mach_id, acl_type, acl_id) VALUES (%d, '%s', %d)", + asha_fields, + 3, 0, - qgli_fields, - 1, 0, - 5, - &qgli_validate, + NULL, + &asha_validate, }, { - /* Q_GMOL - GET_MEMBERS_OF_LIST */ - "get_members_of_list", - "gmol", - RETRIEVE, - (char *)0, - "imembers", - (char *)0, - gmol_fields, + /* Q_USHA - UPDATE_SERVER_HOST_ACCESS */ + "update_server_host_access", + "usha", + 2, + UPDATE, + "ha", + HOSTACCESS_TABLE, + "hostaccess SET acl_type = '%s', acl_id = %d", + asha_fields, 2, - (char *)0, + "mach_id = %d", 1, - &gmol_validate, + NULL, + &asha_validate, }, { - /* Q_GEML - GET_END_MEMBERS_OF_LIST */ - "get_end_members_of_list", - "geml", - RETRIEVE, - (char *)0, - "imembers", - (char *)0, - gmol_fields, - 0, - (char *)0, - 1, - &geml_validate, - }, - - { - /* Q_GLOM - GET_LISTS_OF_MEMBER */ - "get_lists_of_member", - "glom", - RETRIEVE, - 0, - "imembers", - 0, - glom_fields, - 6, - 0, + /* Q_DSHA - DELETE_SERVER_HOST_ACCESS */ + "delete_server_host_access", + "dsha", 2, - &glom_validate, - }, - - { - /* Q_CMOL - COUNT_MEMBERS_OF_LIST */ - "count_members_of_list", - "cmol", - RETRIEVE, - 0, - "imembers", - 0, - cmol_fields, - 1, + DELETE, + "ha", + HOSTACCESS_TABLE, 0, + asha_fields, + 0, + "mach_id = %d", 1, - &cmol_validate, + NULL, + &VDmach, }, { - /* Q_GZCL - GET_ZEPHYR_CLASS */ - "get_zephyr_class", - "gzcl", + /* Q_GACL - GET_ACL */ + "get_acl", + "gacl", + 2, RETRIEVE, - "z", - "zephyr", - "CHAR(z.class), z.xmt_type, CHAR(z.xmt_id), z.sub_type, CHAR(z.sub_id), z.iws_type, CHAR(z.iws_id), z.iui_type, CHAR(z.iui_id), CHAR(z.modtime), CHAR(z.modby), z.modwith FROM zephyr z", - gzcl_fields, - 12, - "z.class LIKE '%s' ESCAPE '*'", - 1, - &gzcl_validate, - }, + "ac", + ACL_TABLE, + "m.name, ac.target, ac.kind, l.name FROM acl ac, machine m, list l", + gacl_fields, + 4, + "m.mach_id = %d AND m.mach_id = ac.mach_id AND ac.target LIKE '%s' AND l.list_id = ac.list_id", + 2, + "m.name, ac.target, ac.kind", + &gacl_validate, + }, { - /* Q_AZCL - ADD_ZEPHYR_CLASS */ - "add_zephyr_class", - "azcl", + /* Q_AACL - ADD_ACL */ + "add_acl", + "aacl", + 2, APPEND, - "z", - "zephyr", - "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, + "ac", + ACL_TABLE, + "INTO acl (mach_id, target, kind, list_id) VALUES (%d, '%s', '%s', %d)", + aacl_fields, + 4, 0, 0, - &azcl_validate, - }, - - { - /* Q_UZCL - UPDATE_ZEPHYR_CLASS */ - "update_zephyr_class", - "uzcl", - UPDATE, - "z", - "zephyr", - "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, - &uzcl_validate, - }, + NULL, + &aacl_validate, + }, { - /* Q_DZCL - DELETE_ZEPHYR_CLASS */ - "delete_zephyr_class", - "dzcl", + /* Q_DACL - DELETE_ACL */ + "delete_acl", + "dacl", + 2, DELETE, - "z", - "zephyr", + "ac", + ACL_TABLE, 0, - uzcl_fields, + dacl_fields, 0, - "class = '%s'", - 1, - &dzcl_validate, - }, + "mach_id = %d AND target = '%s'", + 2, + NULL, + &gacl_validate, + }, { /* Q_GSVC - GET_SERVICE */ "get_service", "gsvc", + 2, RETRIEVE, "ss", - "services", - "CHAR(ss.name), ss.protocol, CHAR(ss.port), ss.description, CHAR(ss.modtime), CHAR(ss.modby), ss.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, - "ss.name LIKE '%s' ESCAPE '*'", - 1, - &VDwildsortf, + "name LIKE '%s' AND protocol LIKE '%s'", + 2, + "name", + &VDfix_modby, }, { /* Q_ASVC - ADD_SERVICE */ "add_service", "asvc", + 2, APPEND, "ss", - "services", - "INTO services (name, protocol, port, description) VALUES ('%s','%s',%s,'%s')", + SERVICES_TABLE, + "INTO services (name, protocol, port, description) VALUES ('%s', '%s', %s, NVL('%s', CHR(0)))", asvc_fields, 4, - (char *)0, + NULL, 0, + NULL, &asvc_validate, }, @@ -4292,164 +6120,288 @@ struct query Queries2[] = { /* Q_DSVC - DELETE_SERVICE */ "delete_service", "dsvc", + 2, DELETE, "ss", - "services", + SERVICES_TABLE, 0, - asvc_fields, + dsvc_fields, 0, - "name = '%s'", + "name = '%s' AND protocol = '%s'", + 2, + NULL, + &dsvc_validate, + }, + + { + /* Q_GPRN - GET_PRINTER */ + "get_printer", + "gprn", + 2, + RETRIEVE, + "pr", + PRINTERS_TABLE, + "pr.name, pr.type, pr.hwtype, pr.duplexname, m1.name, m2.name, m3.name, pr.rp, m4.name, pr.ka, pr.pc, l1.name, l2.name, pr.banner, pr.location, pr.contact, TO_CHAR(pr.modtime, 'DD-mon-YYYY HH24:MI:SS'), pr.modby, pr.modwith FROM printers pr, machine m1, machine m2, machine m3, machine m4, list l1, list l2", + gprn_fields, + 19, + "pr.name LIKE '%s' AND m1.mach_id = pr.mach_id AND m2.mach_id = pr.loghost AND m3.mach_id = pr.rm AND m4.mach_id = pr.rq AND l1.list_id = pr.ac AND l2.list_id = pr.lpc_acl", 1, - &asvc_validate, + "pr.name", + &VDfix_modby, }, { - /* Q_GPCE - GET_PRINTCAP_ENTRY */ - "get_printcap_entry", - "gpce", + /* Q_GPBD - GET_PRINTER_BY_DUPLEXNAME */ + "get_printer_by_duplexname", + "gpbd", + 2, RETRIEVE, - "pc", - "printcap", - "CHAR(pc.name), CHAR(m.name), pc.dir, pc.rp, CHAR(pc.quotaserver), CHAR(pc.auth), CHAR(pc.price), pc.comments, CHAR(pc.modtime), CHAR(pc.modby), pc.modwith FROM printcap pc, machine m", - gpce_fields, - 11, - "pc.name LIKE '%s' ESCAPE '*' AND m.mach_id = pc.mach_id", + "pr", + PRINTERS_TABLE, + "pr.name, pr.type, pr.hwtype, pr.duplexname, m1.name, m2.name, m3.name, pr.rp, m4.name, pr.ka, pr.pc, l1.name, l2.name, pr.banner, pr.location, pr.contact, TO_CHAR(pr.modtime, 'DD-mon-YYYY HH24:MI:SS'), pr.modby, pr.modwith FROM printers pr, machine m1, machine m2, machine m3, machine m4, list l1, list l2", + gpbd_fields, + 19, + "pr.duplexname LIKE '%s' AND m1.mach_id = pr.mach_id AND m2.mach_id = pr.loghost AND m3.mach_id = pr.rm AND m4.mach_id = pr.rq AND l1.list_id = pr.ac AND l2.list_id = pr.lpc_acl", 1, - &gpce_validate, + "pr.name", + &VDfix_modby, }, { - /* Q_APCE - ADD_PRINTCAP_ENTRY */ - "add_printcap_entry", - "apce", - APPEND, - "pc", - "printcap", - "INTO printcap (name, mach_id, dir, rp, quotaserver, auth, price, comments) VALUES ('%s',%d,'%s','%s',%d,%s,%s,'%s')", - apce_fields, - 8, - 0, - 0, - &apce_validate, + /* Q_GPBE - GET_PRINTER_BY_ETHERNET */ + "get_printer_by_ethernet", + "gpbe", + 2, + RETRIEVE, + "pr", + PRINTERS_TABLE, + "pr.name, pr.type, pr.hwtype, pr.duplexname, m1.name, m2.name, m3.name, pr.rp, m4.name, pr.ka, pr.pc, l1.name, l2.name, pr.banner, pr.location, pr.contact, TO_CHAR(pr.modtime, 'DD-mon-YYYY HH24:MI:SS'), pr.modby, pr.modwith FROM printers pr, machine m1, machine m2, machine m3, machine m4, list l1, list l2", + gpbd_fields, + 19, + "m1.hwaddr LIKE LOWER('%s') AND m1.mach_id = pr.mach_id AND m2.mach_id = pr.loghost AND m3.mach_id = pr.rm AND m4.mach_id = pr.rq AND l1.list_id = pr.ac AND l2.list_id = pr.lpc_acl", + 1, + "pr.name", + &VDfix_modby, }, { - /* Q_DPCE - DELETE_PRINTCAP_ENTRY */ - "delete_printcap_entry", - "dpce", - DELETE, - "pc", - "printcap", - 0, - apce_fields, - 0, - "name = '%s'", + /* Q_GPBH - GET_PRINTER_BY_HOSTNAME */ + "get_printer_by_hostname", + "gpbh", + 2, + RETRIEVE, + "pr", + PRINTERS_TABLE, + "pr.name, pr.type, pr.hwtype, pr.duplexname, m1.name, m2.name, m3.name, pr.rp, m4.name, pr.ka, pr.pc, l1.name, l2.name, pr.banner, pr.location, pr.contact, TO_CHAR(pr.modtime, 'DD-mon-YYYY HH24:MI:SS'), pr.modby, pr.modwith FROM printers pr, machine m1, machine m2, machine m3, machine m4, list l1, list l2", + gpbh_fields, + 19, + "m1.name LIKE UPPER('%s') AND m1.mach_id = pr.mach_id AND m2.mach_id = pr.loghost AND m3.mach_id = pr.rm AND m4.mach_id = pr.rq AND l1.list_id = pr.ac AND l2.list_id = pr.lpc_acl", 1, - &dpce_validate, + "pr.name", + &VDfix_modby, }, { - /* Q_GPCP - GET_PRINTCAP */ - "get_printcap", - "gpcp", + /* Q_GPBR - GET_PRINTER_BY_RM */ + "get_printer_by_rm", + "gpbr", + 2, RETRIEVE, - "pc", - "printcap", - "CHAR(pc.name), CHAR(m.name), pc.dir, pc.rp, pc.comments, CHAR(pc.modtime), CHAR(pc.modby), pc.modwith FROM printcap pc, machine m", - gpcp_fields, - 8, - "pc.name LIKE '%s' ESCAPE '*' AND m.mach_id = pc.mach_id", + "pr", + PRINTERS_TABLE, + "pr.name, pr.type, pr.hwtype, pr.duplexname, m1.name, m2.name, m3.name, pr.rp, m4.name, pr.ka, pr.pc, l1.name, l2.name, pr.banner, pr.location, pr.contact, TO_CHAR(pr.modtime, 'DD-mon-YYYY HH24:MI:SS'), pr.modby, pr.modwith FROM printers pr, machine m1, machine m2, machine m3, machine m4, list l1, list l2", + gpbr_fields, + 19, + "m3.name LIKE UPPER('%s') AND m1.mach_id = pr.mach_id AND m2.mach_id = pr.loghost AND m3.mach_id = pr.rm AND m4.mach_id = pr.rq AND l1.list_id = pr.ac AND l2.list_id = pr.lpc_acl", + 1, + "pr.name", + &VDfix_modby, + }, + + { + /* Q_GPBL - GET_PRINTER_BY_LOCATION */ + "get_printer_by_location", + "gpbl", + 2, + RETRIEVE, + "pr", + PRINTERS_TABLE, + "pr.name, pr.type, pr.hwtype, pr.duplexname, m1.name, m2.name, m3.name, pr.rp, m4.name, pr.ka, pr.pc, l1.name, l2.name, pr.banner, pr.location, pr.contact, TO_CHAR(pr.modtime, 'DD-mon-YYYY HH24:MI:SS'), pr.modby, pr.modwith FROM printers pr, machine m1, machine m2, machine m3, machine m4, list l1, list l2", + gpbl_fields, + 19, + "UPPER(pr.location) LIKE UPPER('%s') AND m1.mach_id = pr.mach_id AND m2.mach_id = pr.loghost AND m3.mach_id = pr.rm AND m4.mach_id = pr.rq AND l1.list_id = pr.ac AND l2.list_id = pr.lpc_acl", + 1, + "pr.name", + &VDfix_modby, + }, + + { + /* Q_GPBC - GET_PRINTER_BY_CONTACT */ + "get_printer_by_contact", + "gpbc", + 2, + RETRIEVE, + "pr", + PRINTERS_TABLE, + "pr.name, pr.type, pr.hwtype, pr.duplexname, m1.name, m2.name, m3.name, pr.rp, m4.name, pr.ka, pr.pc, l1.name, l2.name, pr.banner, pr.location, pr.contact, TO_CHAR(pr.modtime, 'DD-mon-YYYY HH24:MI:SS'), pr.modby, pr.modwith FROM printers pr, machine m1, machine m2, machine m3, machine m4, list l1, list l2", + gpbc_fields, + 19, + "UPPER(pr.contact) LIKE UPPER('%s') AND m1.mach_id = pr.mach_id AND m2.mach_id = pr.loghost AND m3.mach_id = pr.rm AND m4.mach_id = pr.rq AND l1.list_id = pr.ac AND l2.list_id = pr.lpc_acl", 1, - &VDwildsortf, + "pr.name", + &VDfix_modby, + }, + + { + /* Q_APRN - ADD_PRINTER */ + "add_printer", + "aprn", + 2, + APPEND, + "pr", + PRINTERS_TABLE, + "INTO printers (name, type, hwtype, duplexname, mach_id, loghost, rm, rp, rq, ka, pc, ac, lpc_acl, banner, location, contact) VALUES ('%s', '%s', '%s', NVL('%s', CHR(0)), %d, %d, %d, NVL('%s', CHR(0)), %d, %s, %s, %d, %d, %s, NVL('%s', CHR(0)), NVL('%s', CHR(0)))", + aprn_fields, + 16, + 0, + 0, + NULL, + &aprn_validate, + }, + + { + /* Q_UPRN - UPDATE_PRINTER */ + "update_printer", + "uprn", + 2, + UPDATE, + "pr", + PRINTERS_TABLE, + "printers SET name = '%s', type = '%s', hwtype = '%s', duplexname = NVL('%s', CHR(0)), mach_id = %d, loghost = %d, rm = %d, rp = NVL('%s', CHR(0)), rq = %d, ka = %d, pc = %d, ac = %d, lpc_acl = %d, banner = %d, location = NVL('%s', CHR(0)), contact = NVL('%s', CHR(0))", + uprn_fields, + 16, + 0, + 0, + NULL, + &uprn_validate, }, { - /* Q_DPCP - DELETE_PRINTCAP */ - "delete_printcap", - "dpcp", + /* Q_DPRN - DELETE_PRINTER */ + "delete_printer", + "dprn", + 2, DELETE, - "pc", - "printcap", + "pr", + PRINTERS_TABLE, 0, - apce_fields, + aprn_fields, 0, "name = '%s'", 1, - &dpce_validate, + NULL, + &dprn_validate, }, { - /* Q_GPDM - GET_PALLADIUM */ - "get_palladium", - "gpdm", + /* Q_GPSV - GET_PRINT_SERVER */ + "get_print_server", + "gpsv", + 2, RETRIEVE, - "pal", - "palladium", - "CHAR(pal.name), CHAR(pal.ident), CHAR(m.name), CHAR(pal.modtime), CHAR(pal.modby), pal.modwith FROM palladium pal, machine m", - gpdm_fields, - 6, - "pal.name LIKE '%s' ESCAPE '*' AND m.mach_id = pal.mach_id", + "ps", + PRINTSERVERS_TABLE, + "m.name, ps.kind, s.string, ps.owner_type, ps.owner_id, l.name, TO_CHAR(ps.modtime, 'DD-mon-YYYY HH24:MI:SS'), ps.modby, ps.modwith FROM printservers ps, machine m, strings s, list l", + gpsv_fields, + 9, + "ps.mach_id = %d AND m.mach_id = ps.mach_id AND s.string_id = ps.printer_types AND l.list_id = ps.lpc_acl", 1, - &VDwildsortf, + NULL, + &gpsv_validate, }, { - /* Q_APDM - ADD_PALLADIUM */ - "add_palladium", - "apdm", + /* Q_APSV - ADD_PRINT_SERVER */ + "add_print_server", + "apsv", + 2, APPEND, - "pal", - "palladium", - "INTO palladium (name, ident, mach_id) VALUES ('%s',%s,%d)", - apdm_fields, - 3, + "ps", + PRINTSERVERS_TABLE, + "INTO printservers (mach_id, kind, printer_types, owner_type, owner_id, lpc_acl) VALUES (%d, '%s', %d, '%s', %d, %d)", + apsv_fields, + 6, 0, 0, - &apdm_validate, + NULL, + &apsv_validate, + }, + + { + /* Q_UPSV - UPDATE_PRINT_SERVER */ + "update_print_server", + "upsv", + 2, + UPDATE, + "ps", + PRINTSERVERS_TABLE, + "printservers SET kind = '%s', printer_types = %d, owner_type = '%s', owner_id = %d, lpc_acl = %d", + apsv_fields, + 5, + "mach_id = %d", + 1, + NULL, + &apsv_validate, }, { - /* Q_DPDM - DELETE_PALLADIUM */ - "delete_palladium", - "dpdm", + /* Q_DPSV - DELETE_PRINT_SERVER */ + "delete_print_server", + "dpsv", + 2, DELETE, - "pal", - "palladium", + "ps", + PRINTSERVERS_TABLE, 0, - apdm_fields, + dpsv_fields, 0, - "name = '%s'", + "mach_id = %d", 1, - &dpdm_validate, + NULL, + &dpsv_validate, }, { /* Q_GALI - GET_ALIAS */ "get_alias", "gali", + 2, RETRIEVE, "a", - ALIAS, - "CHAR(a.name), CHAR(a.type), CHAR(a.trans) FROM alias a", + ALIAS_TABLE, + "name, type, trans FROM alias", gali_fields, 3, - "a.name LIKE '%s' ESCAPE '*' AND a.type LIKE '%s' ESCAPE '*' AND a.trans LIKE '%s' ESCAPE '*'", + "name LIKE '%s' AND type LIKE '%s' AND trans LIKE '%s'", 3, - &VDwild3sort1, + "type, name, trans", + NULL, }, { /* Q_AALI - ADD_ALIAS */ "add_alias", "aali", + 2, APPEND, "a", - ALIAS, + ALIAS_TABLE, "INTO alias (name, type, trans) VALUES ('%s', '%s', '%s')", aali_fields, 3, - (char *)0, + NULL, 0, + NULL, &aali_validate, }, @@ -4457,14 +6409,16 @@ struct query Queries2[] = { /* Q_DALI - DELETE_ALIAS */ "delete_alias", "dali", + 2, DELETE, "a", - ALIAS, - (char *)0, + ALIAS_TABLE, + NULL, aali_fields, 0, - "name = '%s' AND type = '%s' AND trans = '%s'", + "name = '%s' AND type = '%s' AND trans = '%s'", 3, + NULL, &dali_validate, }, @@ -4472,14 +6426,16 @@ struct query Queries2[] = { /* Q_GVAL - GET_VALUE */ "get_value", "gval", + 2, RETRIEVE, "val", - "numvalues", - "CHAR(val.value) FROM numvalues val", + NUMVALUES_TABLE, + "value FROM numvalues", gval_fields, 1, - "val.name = '%s'", + "name = '%s'", 1, + NULL, &gval_validate, }, @@ -4487,14 +6443,16 @@ struct query Queries2[] = { /* Q_AVAL - ADD_VALUE */ "add_value", "aval", + 2, APPEND, "val", - "numvalues", + NUMVALUES_TABLE, "INTO numvalues (name, value) VALUES ('%s', %s)", aval_fields, 2, - (char *)0, + NULL, 0, + NULL, &aval_validate, }, @@ -4502,14 +6460,16 @@ struct query Queries2[] = { /* Q_UVAL - UPDATE_VALUE */ "update_value", "uval", + 2, UPDATE, "val", - "numvalues", + NUMVALUES_TABLE, "numvalues SET value = %s", aval_fields, 1, "name = '%s'", 1, + NULL, &aval_validate, }, @@ -4517,14 +6477,16 @@ struct query Queries2[] = { /* Q_DVAL - DELETE_VALUE */ "delete_value", "dval", + 2, DELETE, "val", - "numvalues", - (char *)0, + NUMVALUES_TABLE, + NULL, dval_fields, 0, "name = '%s'", 1, + NULL, &aval_validate, }, @@ -4532,14 +6494,16 @@ struct query Queries2[] = { /* Q_GATS - GET_ALL_TABLE_STATS */ "get_all_table_stats", "gats", + 2, RETRIEVE, "tbs", - "tblstats", - "tbs.table_name, CHAR(tbs.appends), CHAR(tbs.updates), CHAR(tbs.deletes), CHAR(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, 5, - (char *)0, + NULL, 0, + "table_name", 0, }, @@ -4547,17 +6511,274 @@ struct query Queries2[] = { /* Q__SDL - _SET_DEBUG_LEVEL */ "_set_debug_level", "_sdl", + 2, UPDATE, - (char *)0, - (char *)0, - (char *)0, + NULL, + 0, + NULL, _sdl_fields, 1, - (char *)0, + NULL, 0, + NULL, &_sdl_validate, }, + { + /* Q_GUSL - GET_USER_SIDS_BY_LOGIN, v4 */ + "get_user_sids_by_login", + "gusl", + 4, + RETRIEVE, + "s", + USERSIDS_TABLE, + "u.login, us.sid, TO_CHAR(us.created, 'YYYY-MM-DD HH24:MI:SS') FROM users u, usersids us", + gusl_fields, + 3, + "us.users_id = %d AND u.users_id = us.users_id AND SUBSTR(us.sid, 1, LENGTH(us.sid)-8) = '%s'", + 2, + NULL, + &gusl_validate, + }, + + { + /* Q_AUSL - ADD_USER_SID_BY_LOGIN, v4 */ + "add_user_sid_by_login", + "ausl", + 4, + APPEND, + "s", + USERSIDS_TABLE, + "INTO usersids (users_id, sid) VALUES (%d, '%s')", + ausl_fields, + 2, + NULL, + 0, + NULL, + &ausl_validate, + }, + + { + /* Q_GLSN - GET_LIST_SIDS_BY_NAME, v4 */ + "get_list_sids_by_name", + "glsn", + 4, + RETRIEVE, + "s", + LISTSIDS_TABLE, + "l.name, ls.sid, TO_CHAR(ls.created, 'YYYY-MM-DD HH24:MI:SS') FROM list l, listsids ls", + glsn_fields, + 3, + "ls.list_id = %d AND l.list_id = ls.list_id AND SUBSTR(ls.sid, 1, LENGTH(ls.sid)-8) = '%s'", + 2, + NULL, + &glsn_validate, + }, + + { + /* Q_ALSN - ADD_LIST_SID_BY_NAME, v4 */ + "add_list_sid_by_name", + "alsn", + 4, + APPEND, + "s", + LISTSIDS_TABLE, + "INTO listsids (list_id, sid) VALUES (%d, '%s')", + alsn_fields, + 2, + NULL, + 0, + NULL, + &alsn_validate, + }, + + { + /* Q_GDDS - GET_DISTINCT_DOMAIN_SIDS, v4 */ + "get_distinct_domain_sids", + "gdds", + 4, + RETRIEVE, + "s", + USERSIDS_TABLE, + "DISTINCT SUBSTR(sid, 1, LENGTH(sid)-8) FROM usersids", + gdds_fields, + 1, + NULL, + 0, + NULL, + NULL, + }, + + { + /* Q_GCON - GET_CONTAINER, v7 */ + "get_container", + "gcon", + 7, + RETRIEVE, + "c", + CONTAINERS_TABLE, + "name, description, location, contact, acl_type, acl_id, memacl_type, memacl_id, TO_CHAR(modtime, 'DD-mon-YYYY HH24:MI:SS'), modby, modwith FROM containers", + gcon_fields, + 11, + "name = '%s' AND cnt_id != 0", + 1, + NULL, + &gcon_validate, + }, + + { + /* Q_ACON - ADD_CONTAINER, v7 */ /* uses prefetch_value() for cnt_id */ + "add_container", + "acon", + 7, + APPEND, + "c", + CONTAINERS_TABLE, + "INTO containers (name, description, location, contact, acl_type, acl_id, memacl_type, memacl_id, cnt_id) VALUES ('%s', NVL('%s', CHR(0)), NVL('%s', CHR(0)), NVL('%s', CHR(0)), '%s', %d, '%s', %d, %s)", + acon_fields, + 8, + 0, + 0, + NULL, + &acon_validate, + }, + + { + /* Q_UCON - UPDATE_CONTAINER, v7 */ + "update_container", + "ucon", + 7, + UPDATE, + 0, + CONTAINERS_TABLE, + 0, + ucon_fields, + 8, + 0, + 1, + NULL, + &ucon_validate, + }, + + { + /* Q_DCON - DELETE_CONTAINER, v7 */ + "delete_container", + "dcon", + 7, + DELETE, + "c", + CONTAINERS_TABLE, + NULL, + dcon_fields, + 0, + "cnt_id = %d", + 1, + NULL, + &dcon_validate, + }, + + { + /* Q_AMCN - ADD_MACHINE_TO_CONTAINER, v7 */ + "add_machine_to_container", + "amcn", + 7, + APPEND, + "mcn", + MCNTMAP_TABLE, + "INTO mcntmap (mach_id, cnt_id) VALUES (%d, %d)", + amcn_fields, + 2, + 0, + 0, + NULL, + &amcn_validate, + }, + + { + /* Q_DMCN - DELETE_MACHINE_FROM_CONTAINER, v7 */ + "delete_machine_from_container", + "dmcn", + 7, + DELETE, + "mcn", + MCNTMAP_TABLE, + 0, + amcn_fields, + 0, + "mach_id = %d AND cnt_id = %d", + 2, + NULL, + &dmcn_validate, + }, + + { + /* Q_GMNM - GET_MACHINE_TO_CONTAINER_MAP, v7 */ + "get_machine_to_container_map", + "gmnm", + 7, + RETRIEVE, + "mcn", + MCNTMAP_TABLE, + "m.name, c.name FROM machine m, containers c, mcntmap mcn", + gmnm_fields, + 2, + "m.name = UPPER('%s') AND mcn.cnt_id = c.cnt_id AND mcn.mach_id = m.mach_id", + 1, + NULL, + NULL, + }, + + { + /* Q_GMOC - GET_MACHINES_OF_CONTAINER, v7 */ + "get_machines_of_container", + "gmoc", + 7, + RETRIEVE, + NULL, + MCNTMAP_TABLE, + NULL, + gmoc_fields, + 2, + NULL, + 2, + NULL, + &gmoc_validate, + }, + + { + /* Q_GSOC - GET_SUBCONTAINERS_OF_CONTAINER, v7 */ + "get_subcontainers_of_container", + "gsoc", + 7, + RETRIEVE, + NULL, + CONTAINERS_TABLE, + NULL, + gsoc_fields, + 1, + NULL, + 2, + NULL, + &gsoc_validate, + }, + + { + /* Q_GTLC - GET_TOPLEVEL_CONTAINERS, v7 */ + "get_toplevel_containers", + "gtlc", + 7, + RETRIEVE, + "c", + CONTAINERS_TABLE, + "name FROM containers", + gtlc_fields, + 1, + "name NOT LIKE '%%/%%'", + 0, + "name", + NULL, + }, + }; -int QueryCount2 = (sizeof Queries2 / sizeof (struct query)); +int QueryCount = (sizeof(Queries) / sizeof(struct query));