X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/263a36d43d98dd26dde954572df926055876d7a6..200545fb5b96f63266e1b27195edd02217592671:/server/queries2.c diff --git a/server/queries2.c b/server/queries2.c index e8e2ae4e..10436cbd 100644 --- a/server/queries2.c +++ b/server/queries2.c @@ -1,6 +1,6 @@ /* $Id$ * - * This file defines the query dispatch table for version 2 of the protocol + * This file defines the query dispatch table * * Copyright (C) 1987-1998 by the Massachusetts Institute of Technology. * For copying and distribution information, please see the file @@ -42,6 +42,10 @@ static struct valobj VOfilesys0[] = { {V_ID, 0, FILESYS_TABLE, "label", "filsys_id", MR_FILESYS}, }; +static struct valobj VOcon0[] = { + {V_ID, 0, CONTAINERS_TABLE, "name", "cnt_id", MR_CONTAINER}, +}; + static struct valobj VOnum0[] = { {V_NUM, 0}, }; @@ -67,20 +71,68 @@ static struct validate VDfix_modby = { /* Query data */ -static char *galo_fields[] = { +static char *galo2_fields[] = { "login", "unix_uid", "shell", "last", "first", "middle", }; +static char *galo_fields[] = { + "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 *gual3_fields[] = { + "login", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "comments", "signature", "secure", "modtime", + "modby", "modwith", "created", "creator", +}; + +static char *gual11_fields[] = { + "login", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "comments", "signature", "secure", + "winhomedir", "winprofiledir", "modtime", "modby", "modwith", "created", + "creator", +}; + static char *gual_fields[] = { + "login", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "comments", "signature", "secure", + "winhomedir", "winprofiledir", "sponsor_type", "sponsor_name", "expiration", + "modtime", "modby", "modwith", "created", "creator", +}; + +static char *gubl2_fields[] = { "login", "login", "unix_uid", "shell", "last", "first", "middle", "status", - "clearid", "class", "comments", "signature", "secure", "modby", "modby", "modwith", + "clearid", "class", "modtime", "modby", "modwith", }; static char *gubl_fields[] = { "login", - "login", "unix_uid", "shell", "last", "first", "middle", "status", - "clearid", "class", "modby", "modby", "modwith", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "modtime", "modby", "modwith", "created", + "creator", +}; + +static struct validate gubl2_validate = +{ + 0, + 0, + 0, + 0, + 0, + 0, + access_login, + 0, + followup_fix_modby, }; static struct validate gubl_validate = @@ -93,19 +145,80 @@ static struct validate gubl_validate = 0, access_login, 0, - followup_guax, + followup_get_user, +}; + +static char *guau2_fields[] = { + "unix_uid", + "login", "unix_uid", "shell", "last", "first", "middle", "status", + "clearid", "class", "comments", "signature", "secure", + "modtime", "modby", "modwith", +}; + +static char *guau3_fields[] = { + "unix_uid", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "comments", "signature", "secure", + "modtime", "modby", "modwith", "created", "creator", +}; + +static char *guau11_fields[] = { + "unix_uid", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "comments", "signature", "secure", + "winhomedir", "winprofiledir", "modtime", "modby", "modwith", "created", + "creator", }; static char *guau_fields[] = { "unix_uid", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "comments", "signature", "secure", + "winhomedir", "winprofiledir", "sponsor_type", "sponsor_name", "expiration", + "modtime", "modby", "modwith", "created", "creator", +}; + +static char *guan2_fields[] = { + "first", "last", "login", "unix_uid", "shell", "last", "first", "middle", "status", - "clearid", "class", "comments", "signature", "secure", "modby", "modby", "modwith", + "clearid", "class", "comments", "signature", "secure", + "modtime", "modby", "modwith", +}; + +static char *guan3_fields[] = { + "first", "last", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "comments", "signature", "secure", + "modtime", "modby", "modwith", "created", "creator", +}; + +static char *guan11_fields[] = { + "first", "last", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "comments", "signature", "secure", + "winhomedir", "winprofiledir", "modtime", "modby", "modwith", "created", + "creator", }; static char *guan_fields[] = { "first", "last", - "login", "unix_uid", "shell", "last", "first", "middle", "status", - "clearid", "class", "comments", "signature", "secure", "modby", "modby", "modwith", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "comments", "signature", "secure", + "winhomedir", "winprofiledir", "sponsor_type", "sponsor_name", "expiration", + "modtime", "modby", "modwith", "created", "creator", +}; + +static struct validate guan2_validate = +{ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + followup_fix_modby, }; static struct validate guan_validate = @@ -118,28 +231,105 @@ static struct validate guan_validate = 0, 0, 0, - followup_guax, + followup_get_user, +}; + +static char *guac2_fields[] = { + "class", + "login", "unix_uid", "shell", "last", "first", "middle", "status", + "clearid", "class", "comments", "signature", "secure", + "modtime", "modby", "modwith", +}; + +static char *guac3_fields[] = { + "class", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "comments", "signature", "secure", + "modtime", "modby", "modwith", "created", "creator", +}; + +static char *guac11_fields[] = { + "class", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "comments", "signature", "secure", + "winhomedir", "winprofiledir", "modtime", "modby", "modwith", "created", + "creator", }; static char *guac_fields[] = { "class", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "comments", "signature", "secure", + "winhomedir", "winprofiledir", "sponsor_type", "sponsor_name", "expiration", + "modtime", "modby", "modwith", "created", "creator", +}; + +static char *guam2_fields[] = { + "clearid", "login", "unix_uid", "shell", "last", "first", "middle", "status", - "clearid", "class", "comments", "signature", "secure", "modby", "modby", "modwith", + "clearid", "class", "comments", "signature", "secure", + "modtime", "modby", "modwith", +}; + +static char *guam3_fields[] = { + "clearid", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "comments", "signature", "secure", + "modtime", "modby", "modwith", "created", "creator", +}; + +static char *guam11_fields[] = { + "clearid", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "comments", "signature", "secure", + "winhomedir", "winprofiledir", "modtime", "modby", "modwith", "created", + "creator", }; static char *guam_fields[] = { "clearid", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "comments", "signature", "secure", + "winhomedir", "winprofiledir", "sponsor_type", "sponsor_name", "expiration", + "modtime", "modby", "modwith", "created", "creator", +}; + +static char *guas_fields[] = { + "sponsor_type", "sponsor_name", + "login", +}; + +static struct valobj guas_valobj[] = { + {V_TYPE, 0, 0, "gaus", 0, MR_TYPE}, + {V_TYPEDATA, 1, 0, 0, 0, MR_NO_MATCH}, +}; + +static struct validate guas_validate = { + guas_valobj, + 2, + 0, + 0, + 0, + 0, + access_member, + 0, + get_user_account_by_sponsor, +}; + +static char *gubu2_fields[] = { + "unix_uid", "login", "unix_uid", "shell", "last", "first", "middle", "status", - "clearid", "class", "comments", "signature", "secure", "modby", "modby", "modwith", + "clearid", "class", "modtime", "modby", "modwith", }; static char *gubu_fields[] = { "unix_uid", - "login", "unix_uid", "shell", "last", "first", "middle", "status", - "clearid", "class", "modby", "modby", "modwith", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "modtime", "modby", "modwith", "created", + "creator", }; -static struct validate gubu_validate = +static struct validate gubu2_validate = { VOnum0, 1, @@ -152,13 +342,33 @@ static struct validate gubu_validate = followup_fix_modby, }; -static char *gubn_fields[] = { +static struct validate gubu_validate = +{ + VOnum0, + 1, + 0, + 0, + 0, + 0, + access_login, + 0, + followup_get_user, +}; + +static char *gubn2_fields[] = { "first", "last", "login", "unix_uid", "shell", "last", "first", "middle", "status", - "clearid", "class", "modby", "modby", "modwith", + "clearid", "class", "modtime", "modby", "modwith", }; -static struct validate gubn_validate = +static char *gubn_fields[] = { + "first", "last", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "modtime", "modby", "modwith", "created", + "creator", +}; + +static struct validate gubn2_validate = { 0, 0, @@ -171,42 +381,68 @@ static struct validate gubn_validate = followup_fix_modby, }; +static struct validate gubn_validate = +{ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + followup_get_user, +}; + +static char *gubc2_fields[] = { + "class", + "login", "unix_uid", "shell", "last", "first", "middle", "status", + "clearid", "class", "modtime", "modby", "modwith", +}; + static char *gubc_fields[] = { "class", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "modtime", "modby", "modwith", + "created", "creator", +}; + +static char *gubm2_fields[] = { + "clearid", "login", "unix_uid", "shell", "last", "first", "middle", "status", - "clearid", "class", "modby", "modby", "modwith", + "clearid", "class", "modtime", "modby", "modwith", }; static char *gubm_fields[] = { "clearid", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", + "middle", "status", "clearid", "class", "modtime", "modby", "modwith", + "created", "creator", +}; + +static char *auac2_fields[] = { "login", "unix_uid", "shell", "last", "first", "middle", "status", - "clearid", "class", "modby", "modby", "modwith", + "clearid", "class", "comments", "signature", "secure", }; -static char *gudf_fields[] = { - "login", - "dirsuppress", "dirremote" +static char *auac3_fields[] = { + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", + "middle", "status", "clearid", "class", "comments", "signature", "secure", }; -static struct validate gudf_validate = -{ - VOuser0, - 2, - 0, - 0, - 0, - 0, - access_user, - 0, - 0, +static char *auac11_fields[] = { + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "comments", "signature", "secure", + "winhomedir", "winprofiledir", }; static char *auac_fields[] = { - "login", "unix_uid", "shell", "last", "first", "middle", "status", - "clearid", "class", "comments", "signature", "secure", + "login", "unix_uid", "shell", "winconsoleshell", "last", "first", "middle", + "status", "clearid", "class", "comments", "signature", "secure", + "winhomedir", "winprofiledir", "sponsor_type", "sponsor_name", "expiration", }; -static struct valobj auac_valobj[] = { +static struct valobj auac2_valobj[] = { {V_CHAR, 0, USERS_TABLE, "login"}, {V_NUM, 1}, {V_CHAR, 2, USERS_TABLE, "shell"}, @@ -217,11 +453,63 @@ static struct valobj auac_valobj[] = { {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, 10}, + {V_NUM, 11}, }; -static struct validate auac_validate = { - auac_valobj, +static struct valobj auac3_valobj[] = { + {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 valobj auac11_valobj[] = { + {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}, + {V_LEN, 13, USERS_TABLE, "winhomedir"}, + {V_LEN, 14, USERS_TABLE, "winprofiledir"}, +}; + +static struct valobj auac_valobj[] = { + {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}, + {V_LEN, 13, USERS_TABLE, "winhomedir"}, + {V_LEN, 14, USERS_TABLE, "winprofiledir"}, + {V_TYPE, 15, 0, "ace_type", 0, MR_ACE}, + {V_TYPEDATA, 16, 0, 0, "list_id", MR_ACE}, + {V_CHAR, 17, USERS_TABLE, "expiration"}, +}; + +static struct validate auac2_validate = { + auac2_valobj, 11, "login", "login = '%s'", @@ -232,9 +520,9 @@ static struct validate auac_validate = { followup_ausr, }; -static struct validate ausr_validate = { - auac_valobj, - 9, +static struct validate auac3_validate = { + auac3_valobj, + 12, "login", "login = '%s'", 1, @@ -244,40 +532,131 @@ static struct validate ausr_validate = { followup_ausr, }; -static char *rusr_fields[] = { - "unix_uid", "login", "fs_type" +static struct validate auac11_validate = { + auac11_valobj, + 14, + "login", + "login = '%s'", + 1, + "users_id", + 0, + setup_ausr, + followup_ausr, }; -static struct valobj rusr_valobj[] = { - {V_NUM, 0}, - {V_CHAR, 1}, - {V_NUM, 2}, +static struct validate auac_validate = { + auac_valobj, + 17, + "login", + "login = '%s'", + 1, + "users_id", + 0, + setup_ausr, + followup_ausr, }; -static struct validate rusr_validate = { - rusr_valobj, - 3, - 0, - 0, - 0, - 0, - 0, - register_user, +static struct validate ausr2_validate = { + auac2_valobj, + 9, + "login", + "login = '%s'", + 1, + "users_id", 0, + setup_ausr, + followup_ausr, }; -static char *uuac_fields[] = { +static struct validate ausr3_validate = { + auac3_valobj, + 10, "login", - "newlogin", "unix_uid", "shell", "last", "first", "middle", "status", - "clearid", "class", "comments", "signature", "secure", + "login = '%s'", + 1, + "users_id", + 0, + setup_ausr, + followup_ausr, }; -static struct valobj uuac_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"}, +static struct validate ausr11_validate = { + auac11_valobj, + 12, + "login", + "login = '%s'", + 1, + "users_id", + 0, + setup_ausr, + followup_ausr, +}; + +static struct validate ausr_validate = { + auac_valobj, + 15, + "login", + "login = '%s'", + 1, + "users_id", + 0, + setup_ausr, + followup_ausr, +}; + +static char *rusr_fields[] = { + "unix_uid", "login", "pobox_type" +}; + +static struct valobj rusr_valobj[] = { + {V_NUM, 0}, + {V_CHAR, 1, USERS_TABLE, "login"}, +}; + +static struct validate rusr_validate = { + rusr_valobj, + 2, + 0, + 0, + 0, + 0, + 0, + register_user, + 0, +}; + +static char *uuac2_fields[] = { + "login", + "newlogin", "unix_uid", "shell", "last", "first", "middle", "status", + "clearid", "class", "comments", "signature", "secure", +}; + +static char *uuac3_fields[] = { + "login", + "newlogin", "unix_uid", "shell", "winconsoleshell", "last", "first", + "middle", "status", "clearid", "class", "comments", "signature", "secure", +}; + +static char *uuac11_fields[] = { + "login", + "newlogin", "unix_uid", "shell", "winconsoleshell", "last", "first", + "middle", "status", "clearid", "class", "comments", "signature", "secure", + "winhomedir", "winprofiledir", +}; + +static char *uuac_fields[] = { + "login", + "newlogin", "unix_uid", "shell", "winconsoleshell", "last", "first", + "middle", "status", "clearid", "class", "comments", "signature", "secure", + "winhomedir", "winprofiledir", "sponsor_type", "sponsor_name", "expiration", +}; + +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}, @@ -286,22 +665,149 @@ static struct valobj uuac_valobj[] = { {V_ID, 10, STRINGS_TABLE, "string", "string_id", MR_NO_MATCH}, {V_NUM, 12}, }; + +static struct valobj uuac3_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, "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 valobj uuac11_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, "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}, + {V_LEN, 14, USERS_TABLE, "winhomedir"}, + {V_LEN, 15, USERS_TABLE, "winprofiledir"}, +}; + +static struct valobj uuac_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, "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}, + {V_LEN, 14, USERS_TABLE, "winhomedir"}, + {V_LEN, 15, USERS_TABLE, "winprofiledir"}, + {V_TYPE, 16, 0, "ace_type", 0, MR_ACE}, + {V_TYPEDATA, 17, 0, 0, "list_id", MR_ACE}, + {V_CHAR, 18, USERS_TABLE, "expiration"}, +}; + +static struct validate uuac2_validate = { + uuac2_valobj, + 12, + 0, + 0, + 0, + "users_id", + 0, + setup_ausr, + set_modtime_by_id, +}; + +static struct validate uuac3_validate = { + uuac3_valobj, + 13, + 0, + 0, + 0, + "users_id", + 0, + setup_ausr, + set_modtime_by_id, +}; + +static struct validate uuac11_validate = { + uuac11_valobj, + 15, + 0, + 0, + 0, + "users_id", + access_update_user, + setup_ausr, + set_modtime_by_id, +}; static struct validate uuac_validate = { uuac_valobj, - 12, + 18, + 0, + 0, + 0, + "users_id", + access_update_user, + setup_ausr, + set_modtime_by_id, +}; + +static struct validate uusr2_validate = { + uuac2_valobj, + 10, + 0, + 0, + 0, + "users_id", + 0, + setup_ausr, + set_modtime_by_id, +}; + +static struct validate uusr3_validate = { + uuac3_valobj, + 11, + 0, + 0, + 0, + "users_id", + 0, + setup_ausr, + set_modtime_by_id, +}; + +static struct validate uusr11_validate = { + uuac11_valobj, + 13, 0, 0, 0, "users_id", 0, setup_ausr, - followup_uuac, + set_modtime_by_id, }; static struct validate uusr_validate = { uuac_valobj, - 11, + 16, 0, 0, 0, @@ -330,7 +836,29 @@ static struct validate uush_validate = { "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[] = { @@ -361,28 +889,44 @@ static struct validate uust_validate = { set_modtime_by_id, }; -static char *uudf_fields[] = { +static char *dusr_fields[] = { "login", - "dirsuppress", "dirremote" }; -static struct validate uudf_validate = { - uust_valobj, - 3, +static struct validate dusr_validate = { + VOuser0, + 1, + 0, + 0, + 0, + 0, + 0, + setup_dusr, + 0, +}; + +static char *aurv_fields[] = { + "login", "reservation", +}; + +static struct validate aurv_validate = { + VOuser0, + 1, 0, 0, 0, "users_id", - access_user, 0, - set_modtime_by_id, + 0, + do_user_reservation, }; -static char *dusr_fields[] = { +static char *gurv_fields[] = { "login", + "reservation", }; -static struct validate dusr_validate = { +static struct validate gurv_validate = { VOuser0, 1, 0, @@ -390,28 +934,25 @@ static struct validate dusr_validate = { 0, 0, 0, - setup_dusr, 0, + get_user_reservations, }; -static char *dubu_fields[] = { - "unix_uid", -}; - -static struct valobj dubu_valobj[] = { - {V_ID, 0, USERS_TABLE, "unix_uid", "users_id", MR_USER} +static char *gubr_fields[] = { + "reservation", + "login", }; -static struct validate dubu_validate = { - dubu_valobj, - 1, +static struct validate gubr_validate = { + 0, + 0, 0, 0, 0, 0, 0, - setup_dusr, 0, + get_user_by_reservation, }; static char *gkum_fields[] = { "login", "kerberos", @@ -434,7 +975,7 @@ static struct validate akum_validate = 2, "users_id", access_user, - setup_akum, + 0, 0, }; @@ -455,7 +996,7 @@ static char *gfbl_fields[] = { "login", "login", "fullname", "nickname", "home_addr", "home_phone", "office_addr", "office_phone", "department", - "affiliation", "modby", "modby", "modwith", + "affiliation", "modtime", "modby", "modwith", }; static struct validate gfbl_validate = { @@ -503,7 +1044,7 @@ static struct validate ufbl_validate = { static char *gpob_fields[] = { "login", - "login", "type", "box", "modby", "modby", "modwith", + "login", "type", "box", "address", "modtime", "modby", "modwith", }; static struct validate gpob_validate = { @@ -551,7 +1092,7 @@ static struct validate spob_validate = /* SET_POBOX */ 0, 0, 0, - access_user, + access_spob, 0, set_pobox, }; @@ -565,8 +1106,8 @@ static struct validate spop_validate = /* SET_POBOX_POP */ 0, 0, access_user, - setup_spop, - set_pobox_modtime, + 0, + set_pobox_pop, }; static struct validate dpob_validate = /* DELETE_POBOX */ @@ -584,12 +1125,63 @@ static struct validate dpob_validate = /* DELETE_POBOX */ static char *gmac_fields[] = { "name", - "name", "type", "modby", "modby", "modwith", + "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 *ghst6_fields[] = { + "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 char *ghbh6_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 char *ghst_fields[] = { "name", "address", "location", "network", - "name", "vendor", "model", "os", "location", "contact", "use", "status", "status_change", "network", "address", "ace_type", "ace_name", "admin_comment", "ops_comment", "created", "creator", "inuse", "modby", "modby", "modwith", + "name", "vendor", "model", "os", "location", "contact", "billing_contact", + "account_number", "use", "status", "status_change", "network", "address", + "ace_type", "ace_name", "admin_comment", "ops_comment", "created", "creator", + "inuse", "modtime", "modby", "modwith", +}; + +static char *ghbh_fields[] = { + "hwaddr", + "name", "vendor", "model", "os", "location", "contact", "billing_contact", + "account_number", "use", "status", "status_change", "network", "address", + "ace_type", "ace_name", "admin_comment", "ops_comment", "created", "creator", + "inuse", "modtime", "modby", "modwith", +}; + +static char *ghba_fields[] = { + "account_number", + "name", "vendor", "model", "os", "location", "contact", "billing_contact", + "account_number", "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 = { @@ -599,16 +1191,23 @@ static struct validate ghst_validate = { 0, 0, 0, - access_host, 0, + setup_ghst, followup_ghst, }; -static char *ahst_fields[] = { - "name", "vendor", "model", "os", "location", "contact", "use", "status", "subnet", "address", "ace_type", "ace_name", "admin_comment", "ops_comment", +static char *ghha_fields[] = { + "name", + "hwaddr", }; -static struct valobj ahst_valobj[] = { +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"}, @@ -624,8 +1223,8 @@ static struct valobj ahst_valobj[] = { {V_ID, 13, STRINGS_TABLE, "string", "string_id", MR_NO_MATCH}, }; -static struct validate ahst_validate = { - ahst_valobj, +static struct validate ahst2_validate = { + ahst2_valobj, 13, "name", "name = UPPER('%s')", @@ -636,20 +1235,20 @@ static struct validate ahst_validate = { set_uppercase_modtime, }; -static char *uhst_fields[] = { - "name", - "newname", "vendor", "model", "os", "location", "contact", "use", "status", "subnet", "address", "ace_type", "ace_name", "admin_comment", "ops_comment", +static char *ahst6_fields[] = { + "name", "vendor", "model", "os", "location", "contact", "billing_contact", + "use", "status", "subnet", "address", "ace_type", "ace_name", + "admin_comment", "ops_comment", }; -static struct valobj uhst_valobj[] = { +static struct valobj ahst6_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_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}, @@ -659,31 +1258,203 @@ static struct valobj uhst_valobj[] = { {V_ID, 14, STRINGS_TABLE, "string", "string_id", MR_NO_MATCH}, }; -static struct validate uhst_validate = { - uhst_valobj, - 15, - 0, - 0, - 0, +static struct validate ahst6_validate = { + ahst6_valobj, + 14, + "name", + "name = UPPER('%s')", + 1, "mach_id", access_host, setup_ahst, - set_modtime_by_id, + set_uppercase_modtime, }; -static char *dhst_fields[] = { - "name", +static char *ahst_fields[] = { + "name", "vendor", "model", "os", "location", "contact", "billing_contact", + "account_number", "use", "status", "subnet", "address", "ace_type", + "ace_name", "admin_comment", "ops_comment", }; -static struct validate dhst_validate = { - VOmach0, - 1, - 0, - 0, - 0, - 0, - 0, - setup_dmac, +static struct valobj ahst_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_CHAR, 6, MACHINE_TABLE, "billing_contact"}, + {V_CHAR, 7, MACHINE_TABLE, "account_number"}, + {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 ahst_validate = { + ahst_valobj, + 15, + "name", + "name = UPPER('%s')", + 1, + "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 *uhst6_fields[] = { + "name", + "newname", "vendor", "model", "os", "location", "contact", "billing_contact", + "use", "status", "subnet", "address", "ace_type", "ace_name", + "admin_comment", "ops_comment", +}; + +static struct valobj uhst6_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_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 uhst6_validate = { + uhst6_valobj, + 16, + 0, + 0, + 0, + "mach_id", + access_host, + setup_ahst, + set_modtime_by_id, +}; + +static char *uhst_fields[] = { + "name", + "newname", "vendor", "model", "os", "location", "contact", "billing_contact", + "account_number", "use", "status", "subnet", "address", "ace_type", + "ace_name", "admin_comment", "ops_comment", +}; + +static struct valobj uhst_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_CHAR, 7, MACHINE_TABLE, "billing_contact"}, + {V_CHAR, 8, MACHINE_TABLE, "account_number"}, + {V_NUM, 9}, + {V_NUM, 10}, + {V_ID, 11, SUBNET_TABLE, "name", "snet_id", MR_SUBNET}, + {V_TYPE, 13, 0, "ace_type", 0, MR_ACE}, + {V_TYPEDATA, 14, 0, 0, 0, MR_ACE}, + {V_ID, 15, STRINGS_TABLE, "string", "string_id", MR_NO_MATCH}, + {V_ID, 16, STRINGS_TABLE, "string", "string_id", MR_NO_MATCH}, +}; + +static struct validate uhst_validate = { + uhst_valobj, + 17, + 0, + 0, + 0, + "mach_id", + access_host, + setup_ahst, + set_modtime_by_id, +}; + +static char *uhha_fields[] = { + "name", + "hwaddr" +}; + +static struct valobj uhha_valobj[] = { + {V_ID, 0, MACHINE_TABLE, "name", "mach_id", MR_MACHINE}, + {V_CHAR, 1, MACHINE_TABLE, "hwaddr"}, +}; + +static struct validate uhha_validate = { + uhha_valobj, + 2, + 0, + 0, + 0, + "mach_id", + 0, + setup_uhha, + set_modtime_by_id, +}; + +static char *dhst_fields[] = { + "name", +}; + +static struct validate dhst_validate = { + VOmach0, + 1, + 0, + 0, + 0, + 0, + 0, + setup_dmac, 0, }; @@ -713,7 +1484,7 @@ static struct validate ahal_validate = { ahal_valobj, 2, "name", - "name = '%s'", + "name = UPPER('%s')", 1, "mach_id", access_ahal, @@ -729,7 +1500,7 @@ static struct validate dhal_validate = { dhal_valobj, 1, "name", - "name = '%s' AND mach_id = %d", + "name = UPPER('%s') AND mach_id = %d", 2, "mach_id", access_ahal, @@ -737,10 +1508,17 @@ static struct validate dhal_validate = { 0, }; +static char *gsnt2_fields[] = { + "name", + "name", "description", "address", "mask", "low", "high", "prefix", + "ace_type", "ace_name", "modtime", "modby", "modwith" +}; + static char *gsnt_fields[] = { "name", - "name", "description", "address", "mask", "low", "high", "prefix", "ace_type", "ace_name", - "modby", "modby", "modwith" + "name", "description", "status", "contact", "account_number", "address", + "mask", "low", "high", "prefix", "ace_type", "ace_name", "modtime", + "modby", "modwith" }; static struct validate gsnt_validate = { @@ -755,11 +1533,12 @@ static struct validate gsnt_validate = { followup_gsnt, }; -static char *asnt_fields[] = { - "name", "description", "address", "mask", "low", "high", "prefix", "ace_type", "ace_name", +static char *asnt2_fields[] = { + "name", "description", "address", "mask", "low", "high", "prefix", + "ace_type", "ace_name", }; -static struct valobj asnt_valobj[] = { +static struct valobj asnt2_valobj[] = { {V_CHAR, 0, SUBNET_TABLE, "name"}, {V_LEN, 1, SUBNET_TABLE, "description"}, {V_NUM, 2}, @@ -771,9 +1550,9 @@ static struct valobj asnt_valobj[] = { {V_TYPEDATA, 8, 0, 0, 0, MR_ACE}, }; -static struct validate asnt_validate = +static struct validate asnt2_validate = { - asnt_valobj, + asnt2_valobj, 9, "name", "name = UPPER('%s')", @@ -784,12 +1563,46 @@ static struct validate asnt_validate = set_uppercase_modtime, }; -static char *usnt_fields[] = { +static char *asnt_fields[] = { + "name", "description", "status", "contact", "account_number", "address", + "mask", "low", "high", "prefix", "ace_type", "ace_name", +}; + +static struct valobj asnt_valobj[] = { + {V_CHAR, 0, SUBNET_TABLE, "name"}, + {V_LEN, 1, SUBNET_TABLE, "description"}, + {V_NUM, 2}, + {V_CHAR, 3, SUBNET_TABLE, "contact"}, + {V_CHAR, 4, SUBNET_TABLE, "account_number"}, + {V_NUM, 5}, + {V_NUM, 6}, + {V_NUM, 7}, + {V_NUM, 8}, + {V_LEN, 9, SUBNET_TABLE, "prefix"}, + {V_TYPE, 10, 0, "ace_type", 0, MR_ACE}, + {V_TYPEDATA, 11, 0, 0, 0, MR_ACE}, +}; + +static struct validate asnt_validate = +{ + asnt_valobj, + 12, + "name", + "name = UPPER('%s')", + 1, + "snet_id", + 0, + setup_asnt, + set_uppercase_modtime, +}; + +static char *usnt2_fields[] = { "name", - "newname", "description", "address", "mask", "low", "high", "prefix", "ace_type", "ace_name", + "newname", "description", "address", "mask", "low", "high", "prefix", + "ace_type", "ace_name", }; -static struct valobj usnt_valobj[] = { +static struct valobj usnt2_valobj[] = { {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"}, @@ -802,9 +1615,9 @@ static struct valobj usnt_valobj[] = { {V_TYPEDATA, 9, 0, 0, 0, MR_ACE}, }; -static struct validate usnt_validate = +static struct validate usnt2_validate = { - usnt_valobj, + usnt2_valobj, 10, "name", "snet_id = %d", @@ -815,6 +1628,41 @@ static struct validate usnt_validate = set_modtime_by_id, }; +static char *usnt_fields[] = { + "name", + "newname", "description", "status", "contact", "account_number", "address", + "mask", "low", "high", "prefix", "ace_type", "ace_name", +}; + +static struct valobj usnt_valobj[] = { + {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_CHAR, 4, SUBNET_TABLE, "contact"}, + {V_CHAR, 5, SUBNET_TABLE, "account_number"}, + {V_NUM, 6}, + {V_NUM, 7}, + {V_NUM, 8}, + {V_NUM, 9}, + {V_LEN, 10, SUBNET_TABLE, "prefix"}, + {V_TYPE, 11, 0, "ace_type", 0, MR_ACE}, + {V_TYPEDATA, 12, 0, 0, 0, MR_ACE}, +}; + +static struct validate usnt_validate = +{ + usnt_valobj, + 13, + "name", + "snet_id = %d", + 1, + "snet_id", + 0, + setup_asnt, + set_modtime_by_id, +}; + static char *dsnt_fields[] = { "name", }; @@ -833,7 +1681,7 @@ static struct validate dsnt_validate = { static char *gclu_fields[] = { "name", - "name", "description", "location", "modby", "modby", "modwith", + "name", "description", "location", "modtime", "modby", "modwith", }; static char *aclu_fields[] = { @@ -965,10 +1813,31 @@ static struct validate dcld_validate = set_cluster_modtime_by_id, }; +static char *glin2_fields[] = { + "name", + "name", "active", "publicflg", "hidden", "maillist", "grouplist", "gid", + "ace_type", "ace_name", "description", "modtime", "modby", "modwith", +}; + +static char *glin3_fields[] = { + "name", + "name", "active", "publicflg", "hidden", "maillist", "grouplist", "gid", + "nfsgroup", "ace_type", "ace_name", "description", "modtime", "modby", + "modwith", +}; + +static char *glin4_fields[] = { + "name", + "name", "active", "publicflg", "hidden", "maillist", "grouplist", "gid", + "nfsgroup", "ace_type", "ace_name", "memace_type", "memace_name", + "description", "modtime", "modby", "modwith", +}; + static char *glin_fields[] = { "name", "name", "active", "publicflg", "hidden", "maillist", "grouplist", "gid", - "ace_type", "ace_name", "description", "modby", "modby", "modwith", + "nfsgroup", "mailman", "mailman_server", "ace_type", "ace_name", + "memace_type", "memace_name", "description", "modtime", "modby", "modwith", }; static struct validate glin_validate = { @@ -983,12 +1852,12 @@ static struct validate glin_validate = { followup_glin, }; -static char *alis_fields[] = { +static char *alis2_fields[] = { "name", "active", "publicflg", "hidden", "maillist", "grouplist", "gid", "ace_type", "ace_name", "description", }; -static struct valobj alis_valobj[] = { +static struct valobj alis2_valobj[] = { {V_CHAR, 0, LIST_TABLE, "name"}, {V_NUM, 1}, {V_NUM, 2}, @@ -1001,8 +1870,8 @@ static struct valobj alis_valobj[] = { {V_LEN, 9, LIST_TABLE, "description"}, }; -static struct validate alis_validate = { - alis_valobj, +static struct validate alis2_validate = { + alis2_valobj, 10, "name", "name = '%s'", @@ -1013,15 +1882,14 @@ static struct validate alis_validate = { set_modtime, }; -static char *ulis_fields[] = { - "name", - "newname", "active", "publicflg", "hidden", "maillist", "grouplist", "gid", - "ace_type", "ace_name", "description", +static char *alis3_fields[] = { + "name", "active", "publicflg", "hidden", "maillist", "grouplist", "gid", + "nfsgroup", "ace_type", "ace_name", "description", }; -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}, +static struct valobj alis3_valobj[] = { + {V_CHAR, 0, LIST_TABLE, "name"}, + {V_NUM, 1}, {V_NUM, 2}, {V_NUM, 3}, {V_NUM, 4}, @@ -1033,42 +1901,256 @@ static struct valobj ulis_valobj[] = { {V_LEN, 10, LIST_TABLE, "description"}, }; -static struct validate ulis_validate = { - ulis_valobj, +static struct validate alis3_validate = { + alis3_valobj, 11, "name", - "list_id = %d", + "name = '%s'", 1, "list_id", - access_list, + 0, setup_alis, - set_modtime_by_id, -}; - -static char *dlis_fields[] = { - "name", + set_modtime, }; -static struct validate dlis_validate = { - VOlist0, - 1, - "name", - "list_id = %d", - 1, - 0, - access_list, - setup_dlis, - 0, +static char *alis4_fields[] = { + "name", "active", "publicflg", "hidden", "maillist", "grouplist", "gid", + "nfsgroup", "ace_type", "ace_name", "memace_type", "memace_name", + "description", }; -static char *amtl_fields[] = { +static struct valobj alis4_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 alis4_validate = { + alis4_valobj, + 13, + "name", + "name = '%s'", + 1, + "list_id", + 0, + setup_alis, + set_modtime, +}; + +static char *alis_fields[] = { + "name", "active", "publicflg", "hidden", "maillist", "grouplist", "gid", + "nfsgroup", "mailman", "mailman_server", "ace_type", "ace_name", + "memace_type", "memace_name", "description", +}; + +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_NUM, 8}, + {V_ID, 9, MACHINE_TABLE, "name", "mach_id", MR_MACHINE}, + {V_TYPE, 10, 0, "ace_type", 0, MR_ACE}, + {V_TYPEDATA, 11, 0, 0, "list_id", MR_ACE}, + {V_TYPE, 12, 0, "ace_type", 0, MR_ACE}, + {V_TYPEDATA, 13, 0, 0, "list_id", MR_ACE}, + {V_LEN, 14, LIST_TABLE, "description"}, +}; + +static struct validate alis_validate = { + alis_valobj, + 15, + "name", + "name = '%s'", + 1, + "list_id", + 0, + setup_alis, + set_modtime, +}; + +static char *ulis2_fields[] = { + "name", + "newname", "active", "publicflg", "hidden", "maillist", "grouplist", "gid", + "ace_type", "ace_name", "description", +}; + +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 validate ulis2_validate = { + ulis2_valobj, + 11, + "name", + "list_id = %d", + 1, + "list_id", + access_list, + setup_alis, + set_modtime_by_id, +}; + +static char *ulis3_fields[] = { + "name", + "newname", "active", "publicflg", "hidden", "maillist", "grouplist", "gid", + "nfsgroup", "ace_type", "ace_name", "description", +}; + +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 validate ulis3_validate = { + ulis3_valobj, + 12, + "name", + "list_id = %d", + 1, + "list_id", + access_list, + setup_alis, + set_modtime_by_id, +}; + +static char *ulis4_fields[] = { + "name", + "newname", "active", "publicflg", "hidden", "maillist", "grouplist", "gid", + "nfsgroup", "ace_type", "ace_name", "memace_type", "memace_name", + "description", +}; + +static struct valobj ulis4_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 validate ulis4_validate = { + ulis4_valobj, + 14, + "name", + "list_id = %d", + 1, + "list_id", + access_list, + setup_alis, + set_modtime_by_id, +}; + +static char *ulis_fields[] = { + "name", + "newname", "active", "publicflg", "hidden", "maillist", "grouplist", "gid", + "nfsgroup", "mailman", "mailman_server", "ace_type", "ace_name", + "memace_type", "memace_name", "description", +}; + +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_NUM, 9}, + {V_ID, 10, MACHINE_TABLE, "name", "mach_id", MR_MACHINE}, + {V_TYPE, 11, 0, "ace_type", 0, MR_ACE}, + {V_TYPEDATA, 12, 0, 0, "list_id", MR_ACE}, + {V_TYPE, 13, 0, "ace_type", 0, MR_ACE}, + {V_TYPEDATA, 14, 0, 0, "list_id", MR_ACE}, + {V_LEN, 15, LIST_TABLE, "description"}, +}; + +static struct validate ulis_validate = { + ulis_valobj, + 16, + "name", + "list_id = %d", + 1, + "list_id", + access_list, + setup_alis, + set_modtime_by_id, +}; + +static char *dlis_fields[] = { + "name", +}; + +static struct validate dlis_validate = { + VOlist0, + 1, + "name", + "list_id = %d", + 1, + 0, + access_list, + setup_dlis, + 0, +}; + +static char *amtl_fields[] = { "list_name", "member_type", "member_name", }; +static char *atml_fields[] = { + "list_name", "member_type", "member_name", "tag", +}; + 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 amtl_validate = @@ -1084,6 +2166,32 @@ static struct validate amtl_validate = add_member_to_list, }; +static struct validate atml_validate = +{ + amtl_valobj, + 4, + 0, + 0, + 0, + 0, + access_list, + 0, + add_member_to_list, +}; + +static struct validate tmol_validate = +{ + amtl_valobj, + 4, + 0, + 0, + 0, + 0, + access_list, + 0, + tag_member_of_list, +}; + static struct validate dmfl_validate = { amtl_valobj, @@ -1119,6 +2227,28 @@ static struct validate gaus_validate = { get_ace_use, }; +static char *ghbo_fields[] = { + "ace_type", "ace_name", + "name", +}; + +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 ghbo_validate = { + ghbo_valobj, + 2, + 0, + 0, + 0, + 0, + access_member, + 0, + get_host_by_owner, +}; + static char *qgli_fields[] = { "active", "publicflg", "hidden", "maillist", "grouplist", "list", @@ -1149,19 +2279,12 @@ static char *gmol_fields[] = { "member_type", "member_name", }; -static struct validate gmol_validate = { - VOlist0, - 1, - 0, - 0, - 0, - 0, - access_visible_list, - 0, - get_members_of_list, +static char *gtml_fields[] = { + "list_name", + "member_type", "member_name", "tag", }; -static struct validate geml_validate = { +static struct validate gmol_validate = { VOlist0, 1, 0, @@ -1170,7 +2293,7 @@ static struct validate geml_validate = { 0, access_visible_list, 0, - get_end_members_of_list, + get_members_of_list, }; static char *glom_fields[] = { @@ -1216,7 +2339,7 @@ static char *gsin_fields[] = { "service", "service", "update_int", "target_file", "script", "dfgen", "dfcheck", "type", "enable", "inprogress", "harderror", "errmsg", - "ace_type", "ace_name", "modby", "modby", "modwith", + "ace_type", "ace_name", "modtime", "modby", "modwith", }; static struct validate gsin_validate = @@ -1229,7 +2352,7 @@ static struct validate gsin_validate = 0, access_service, 0, - followup_glin, + followup_gsin, }; static char *qgsv_fields[] = { @@ -1341,7 +2464,7 @@ static char *gshi_fields[] = { "service", "machine", "service", "machine", "enable", "override", "success", "inprogress", "hosterror", "hosterrormsg", "ltt", "lts", "value1", "value2", - "value3", "modby", "modby", "modwith", + "value3", "modtime", "modby", "modwith", }; static struct validate gshi_validate = { @@ -1487,14 +2610,26 @@ static char *gslo_fields[] = { static char *gfsl_fields[] = { "label", - "label", "type", "machine", "name", "mount", "access", "comments", "owner", "owners", - "create", "lockertype", "modby", "modby", "modwith", + "label", "type", "machine", "name", "mount", "access", "comments", + "owner", "owners", "create", "lockertype", "modtime", "modby", "modwith", +}; + +static struct validate gfsl_validate = { + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + followup_fix_modby, }; static char *gfsm_fields[] = { "machine", - "label", "type", "machine", "name", "mount", "access", "comments", "owner", "owners", - "create", "lockertype", "modby", "modby", "modwith", + "label", "type", "machine", "name", "mount", "access", "comments", + "owner", "owners", "create", "lockertype", "modtime", "modby", "modwith", }; static struct validate gfsm_validate = { @@ -1510,9 +2645,9 @@ static struct validate gfsm_validate = { }; static char *gfsn_fields[] = { - "machine", "parition", - "label", "type", "machine", "name", "mount", "access", "comments", "owner", "owners", - "create", "lockertype", "modby", "modby", "modwith", + "machine", "partition", + "label", "type", "machine", "name", "mount", "access", "comments", + "owner", "owners", "create", "lockertype", "modtime", "modby", "modwith", }; static struct validate gfsn_validate = { @@ -1529,14 +2664,14 @@ static struct validate gfsn_validate = { static char *gfsp_fields[] = { "path", - "label", "type", "machine", "name", "mount", "access", "comments", "owner", "owners", - "create", "lockertype", "modby", "modby", "modwith", + "label", "type", "machine", "name", "mount", "access", "comments", + "owner", "owners", "create", "lockertype", "modtime", "modby", "modwith", }; static char *gfsg_fields[] = { "list", - "label", "type", "machine", "name", "mount", "access", "comments", "owner", "owners", - "create", "lockertype", "modby", "modby", "modwith", + "label", "type", "machine", "name", "mount", "access", "comments", + "owner", "owners", "create", "lockertype", "modtime", "modby", "modwith", }; static struct validate gfsg_validate = { @@ -1552,8 +2687,8 @@ static struct validate gfsg_validate = { }; static char *afil_fields[] = { - "label", "type", "machine", "name", "mount", "access", "comments", "owner", "owners", - "create", "lockertype", + "label", "type", "machine", "name", "mount", "access", "comments", + "owner", "owners", "create", "lockertype", }; static struct valobj afil_valobj[] = { @@ -1583,8 +2718,8 @@ static struct validate afil_validate = { }; static char *ufil_fields[] = { - "label", "newlabel", "type", "machine", "name", "mount", "access", "comments", - "owner", "owners", "create", "lockertype", + "label", "newlabel", "type", "machine", "name", "mount", "access", + "comments", "owner", "owners", "create", "lockertype", }; static struct valobj ufil_valobj[] = { @@ -1664,12 +2799,14 @@ static struct validate aftg_validate = { }; static char *ganf_fields[] = { - "machine", "dir", "device", "status", "allocated", "size", "modby", "modby", "modwith", + "machine", "dir", "device", "status", "allocated", "size", + "modtime", "modby", "modwith", }; static char *gnfp_fields[] = { "machine", "dir", - "machine", "dir", "device", "status", "allocated", "size", "modby", "modby", "modwith", + "machine", "dir", "device", "status", "allocated", "size", + "modtime", "modby", "modwith", }; static struct validate gnfp_validate = { @@ -1757,7 +2894,8 @@ static struct validate dnfp_validate = { static char *gqot_fields[] = { "filesys", "type", "name", - "filesys", "type", "name", "quota", "dir", "machine", "modby", "modby", "modwith", + "filesys", "type", "name", "quota", "dir", "machine", + "modtime", "modby", "modwith", }; static struct valobj gqot_valobj[] = { @@ -1779,7 +2917,8 @@ static struct validate gqot_validate = { static char *gqbf_fields[] = { "filesys", - "filesys", "type", "name", "quota", "dir", "machine", "modby", "modby", "modwith", + "filesys", "type", "name", "quota", "dir", "machine", + "modtime", "modby", "modwith", }; static struct validate gqbf_validate = { @@ -1789,7 +2928,7 @@ static struct validate gqbf_validate = { 0, 0, 0, - access_filesys, + 0, 0, followup_gqot, }; @@ -1843,7 +2982,8 @@ static struct validate dqot_validate = { static char *gnfq_fields[] = { "filesys", "login", - "filesys", "login", "quota", "dir", "machine", "modby", "modby", "modwith", + "filesys", "login", "quota", "dir", "machine", + "modtime", "modby", "modwith", }; static struct validate gnfq_validate = { @@ -1853,14 +2993,15 @@ static struct validate gnfq_validate = { 0, 0, 0, - access_filesys, + 0, 0, followup_gqot, }; static char *gnqp_fields[] = { "machine", "dir", - "filesys", "login", "quota", "dir", "machine", "modby", "modby", "modwith", + "filesys", "login", "quota", "dir", "machine", + "modtime", "modby", "modwith", }; static char *anfq_fields[] = { @@ -1909,10 +3050,18 @@ static struct validate dnfq_validate = { 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", "modby", "modby", "modwith", + "iws_type", "iws_name", "iui_type", "iui_name", "owner_type", + "owner_id", "modtime", "modby", "modwith", }; static struct validate gzcl_validate = { @@ -1922,31 +3071,63 @@ static struct validate gzcl_validate = { 0, 0, 0, - 0, + access_zephyr, 0, followup_gzcl, }; -static char *azcl_fields[] = { +static char *azcl2_fields[] = { "class", "xmt_type", "xmt_name", "sub_type", "sub_name", "iws_type", "iws_name", "iui_type", "iui_name", -}; +}; -static struct valobj azcl_valobj[] = { +static struct valobj azcl2_valobj[] = { {V_CHAR, 0, ZEPHYR_TABLE, "class"}, - {V_TYPE, 1, 0, "ace_type", 0, MR_ACE}, + {V_TYPE, 1, 0, "zace_type", 0, MR_ACE}, {V_TYPEDATA, 2, 0, 0, "list_id", MR_ACE}, - {V_TYPE, 3, 0, "ace_type", 0, MR_ACE}, + {V_TYPE, 3, 0, "zace_type", 0, MR_ACE}, {V_TYPEDATA, 4, 0, 0, "list_id", MR_ACE}, - {V_TYPE, 5, 0, "ace_type", 0, MR_ACE}, + {V_TYPE, 5, 0, "zace_type", 0, MR_ACE}, {V_TYPEDATA, 6, 0, 0, "list_id", MR_ACE}, - {V_TYPE, 7, 0, "ace_type", 0, 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, 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, + 11, "class", "class = '%s'", 1, @@ -1956,32 +3137,64 @@ static struct validate azcl_validate = { set_zephyr_modtime, }; -static char *uzcl_fields[] = { +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_NAME, 0, ZEPHYR_TABLE, "class", 0, MR_BAD_CLASS}, {V_RENAME, 1, ZEPHYR_TABLE, "class", 0, MR_NOT_UNIQUE}, - {V_TYPE, 2, 0, "ace_type", 0, MR_ACE}, + {V_TYPE, 2, 0, "zace_type", 0, MR_ACE}, {V_TYPEDATA, 3, 0, 0, "list_id", MR_ACE}, - {V_TYPE, 4, 0, "ace_type", 0, MR_ACE}, + {V_TYPE, 4, 0, "zace_type", 0, MR_ACE}, {V_TYPEDATA, 5, 0, 0, "list_id", MR_ACE}, - {V_TYPE, 6, 0, "ace_type", 0, MR_ACE}, + {V_TYPE, 6, 0, "zace_type", 0, MR_ACE}, {V_TYPEDATA, 7, 0, 0, "list_id", MR_ACE}, - {V_TYPE, 8, 0, "ace_type", 0, 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, - 10, + 12, "class", "class = '%s'", 1, 0, - 0, + access_zephyr, 0, set_zephyr_modtime, }; @@ -2000,7 +3213,7 @@ static struct validate dzcl_validate = { static char *gsha_fields[] = { "machine", - "machine", "ace_type", "ace_name", "modby", "modby", "modwith", + "machine", "ace_type", "ace_name", "modtime", "modby", "modwith", }; static struct validate gsha_validate = @@ -2039,15 +3252,65 @@ static struct validate asha_validate = set_modtime_by_id, }; +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 *gsvc_fields[] = { - "service", - "service", "protocol", "port", "description", "modby", "modby", "modwith", + "service", "protocol", + "service", "protocol", "port", "description", "modtime", "modby", "modwith", }; static char *asvc_fields[] = { "service", "protocol", "port", "description", }; +static char *dsvc_fields[] = { + "service", "protocol", +}; + static struct valobj asvc_valobj[] = { {V_CHAR, 0, SERVICES_TABLE, "name"}, {V_CHAR, 1, SERVICES_TABLE, "protocol"}, @@ -2059,118 +3322,225 @@ static struct validate asvc_validate = { asvc_valobj, 4, "name", - "name = '%s'", - 1, + "name = '%s' AND protocol = '%s'", + 2, 0, 0, 0, - set_modtime, -}; - -static char *gpce_fields[] = { - "printer", - "printer", "spooling_host", "spool_directory", "rprinter", - "quotaserver", "authenticate", "price", "comments", - "modby", "modby", "modwith", + set_service_modtime, }; -static struct validate gpce_validate = { - 0, - 0, - 0, - 0, +static struct validate dsvc_validate = { + asvc_valobj, + 2, + "name", + "name = '%s' AND protocol = '%s'", + 2, 0, 0, 0, 0, - followup_gpce, }; -static char *apce_fields[] = { - "printer", "spooling_host", "spool_directory", "rprinter", - "quotaserver", "authenticate", "price", "comments", - "modby", "modby", "modwith", +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 struct valobj apce_valobj[] = { - {V_CHAR, 0, PRINTCAP_TABLE, "name"}, - {V_ID, 1, MACHINE_TABLE, "name", "mach_id", MR_MACHINE}, - {V_LEN, 2, PRINTCAP_TABLE, "dir"}, - {V_LEN, 3, PRINTCAP_TABLE, "rp"}, +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 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_NUM, 5}, - {V_NUM, 6}, - {V_CHAR, 7, PRINTCAP_TABLE, "comments"}, + {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 apce_validate = { - apce_valobj, - 8, +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, - 0, + access_printer, + setup_aprn, set_modtime, }; -static struct validate dpce_validate = { +static struct validate dprn_validate = { 0, 0, "name", "name = '%s'", 1, 0, - 0, + access_printer, 0, 0, }; -static char *gpcp_fields[] = { - "printer", - "printer", "spooling_host", "spool_directory", "rprinter", "comments", - "modby", "modby", "modwith", +static char *gpsv_fields[] = { + "host", + "host", "kind", "printer_types", "owner_type", "owner_name", + "lpc_acl", "modtime", "modby", "modwith" }; -static char *gpdm_fields[] = { - "name", - "name", "rpcnum", "host", "modby", "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 *apdm_fields[] = { - "name", "rpcnum", "host" +static char *apsv_fields[] = { + "host", "kind", "printer_types", "owner_type", "owner_name", "lpc_acl" }; -static struct valobj apdm_valobj[] = { - {V_CHAR, 0, PALLADIUM_TABLE, "name"}, - {V_NUM, 1}, - {V_ID, 2, MACHINE_TABLE, "name", "mach_id", MR_MACHINE}, +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 apdm_validate = { - apdm_valobj, - 3, - "name", - "name = '%s'", +static struct validate apsv_validate = { + apsv_valobj, + 6, + "mach_id", + "mach_id = %d", 1, + "mach_id", 0, 0, - 0, - set_modtime, + set_modtime_by_id, }; -static struct validate dpdm_validate = { - 0, - 0, - "name", - "name = '%s'", +static char *dpsv_fields[] = { + "host", +}; + +static struct validate dpsv_validate = { + gpsv_valobj, + 1, + "mach_id", + "mach_id = %d", 1, 0, 0, + setup_dpsv, 0, - 0, -}; +}; static char *gali_fields[] = { "name", "type", "trans", @@ -2195,7 +3565,7 @@ static struct validate aali_validate = { 3, 0, 0, - 0, + setup_aali, 0, }; @@ -2259,7 +3629,8 @@ static char *dval_fields[] = { }; static char *gats_fields[] = { - "table_name", "appends", "updates", "deletes", "modby", "modby", "modwith", + "table_name", "appends", "updates", "deletes", + "modtime", "modby", "modwith", }; static char *_sdl_fields[] = { @@ -2279,104 +3650,591 @@ static struct validate _sdl_validate = _sdl_followup, }; +static char *gcon7_fields[] = { + "name", + "name", "description", "location", "contact", + "ace_type", "ace_name", "memace_type", "memace_name", "modtime", "modby", "modwith", +}; - -/* Generalized Query Definitions */ +static struct validate gcon_validate = { + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + followup_gcon, +}; -/* Note: For any query which uses prefetch_value, the vcnt should be - * one less than the number of %-format specifiers in the tlist. - */ +static char *gcon_fields[] = { + "name", + "name", "publicflg", "description", "location", "contact", + "ace_type", "ace_name", "memace_type", "memace_name", "modtime", "modby", "modwith", +}; -struct query Queries2[] = { - { - /* Q_GALO - GET_ALL_LOGINS */ - "get_all_logins", - "galo", - RETRIEVE, - "u", - USERS_TABLE, - "u.login, u.unix_uid, u.shell, u.last, u.first, u.middle FROM users u", - galo_fields, - 6, - "u.users_id != 0", - 0, - "u.login", - 0, - }, +static char *acon7_fields[] = { + "name", "description", "location", "contact", + "ace_type", "ace_name", "memace_type", "memace_name", +}; - { - /* Q_GAAL - GET_ALL_ACTIVE_LOGINS */ - "get_all_active_logins", - "gaal", - RETRIEVE, - "u", - USERS_TABLE, - "u.login, u.unix_uid, u.shell, u.last, u.first, u.middle FROM users u", - galo_fields, - 6, - "u.status = 1", - 0, - "u.login", - 0, - }, +static struct valobj acon7_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}, +}; - { - /* Q_GUAL - GET_USER_ACCOUNT_BY_LOGIN */ - "get_user_account_by_login", - "gual", - RETRIEVE, - "u", - USERS_TABLE, - "u.login, u.unix_uid, u.shell, u.last, u.first, u.middle, u.status, u.clearid, u.type, str.string, u.signature, u.secure, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith FROM users u, strings str", - gual_fields, - 15, - "u.login LIKE '%s' AND u.users_id != 0 AND u.comments = str.string_id", - 1, - "u.login", - &gubl_validate, - }, +static struct validate acon7_validate = +{ + acon7_valobj, + 8, + "name", + "name = '%s'", + 1, + "cnt_id", + 0, + setup_acon, + set_modtime, +}; - { - /* Q_GUAU - GET_USER_ACCOUNT_BY_UID */ - "get_user_account_by_uid", - "guau", - RETRIEVE, - "u", - USERS_TABLE, - "u.login, u.unix_uid, u.shell, u.last, u.first, u.middle, u.status, u.clearid, u.type, str.string, u.signature, u.secure, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith FROM users u, strings str", - guau_fields, - 15, - "u.unix_uid = %s AND u.users_id != 0 AND u.comments = str.string_id", - 1, - "u.login", - &gubu_validate, - }, +static char *acon_fields[] = { + "name", "publicflg", "description", "location", "contact", + "ace_type", "ace_name", "memace_type", "memace_name", +}; - { - /* Q_GUAN - GET_USER_ACCOUNT_BY_NAME */ - "get_user_account_by_name", +static struct valobj acon_valobj[] = { + {V_CHAR, 0, CONTAINERS_TABLE, "name"}, + {V_NUM, 1}, + {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 acon_validate = +{ + acon_valobj, + 9, + "name", + "name = '%s'", + 1, + "cnt_id", + 0, + setup_acon, + set_modtime, +}; + +static char *ucon7_fields[] = { + "name", + "newname", "description", "location", "contact", + "ace_type", "ace_name", "memace_type", "memace_name", +}; + +static struct valobj ucon7_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 ucon7_validate = +{ + ucon7_valobj, + 9, + 0, + 0, + 0, + 0, + access_container, + 0, + update_container, +}; + +static char *ucon_fields[] = { + "name", + "newname", "publicflg", "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_NUM, 2}, + {V_LEN, 3, CONTAINERS_TABLE, "description"}, + {V_CHAR, 4, CONTAINERS_TABLE, "location"}, + {V_CHAR, 5, CONTAINERS_TABLE, "contact"}, + {V_TYPE, 6, 0, "ace_type", 0, MR_ACE}, + {V_TYPEDATA, 7, 0, 0, 0, MR_ACE}, + {V_TYPE, 8, 0, "ace_type", 0, MR_ACE}, + {V_TYPEDATA, 9, 0, 0, 0, MR_ACE}, +}; + +static struct validate ucon_validate = +{ + ucon_valobj, + 10, + 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", +}; + +static char *scli_fields[] = { + "containername", + "listname", +}; + +static struct valobj scli_valobj[] = { + {V_ID, 0, CONTAINERS_TABLE, "name", "cnt_id", MR_CONTAINER}, + {V_ID, 1, LIST_TABLE, "name", "list_id", MR_LIST}, +}; + +static struct validate scli_validate = { + scli_valobj, + 2, + 0, + 0, + 0, + 0, + 0, + setup_scli, + set_container_list, +}; + +static char *gcli_fields[] = { + "containername", + "containername", "listname", +}; + +static struct validate glic_validate = +{ + VOlist0, + 1, + NULL, + NULL, + 0, + 0, + 0, + 0, + 0, +}; + +static char *glic_fields[] = { + "listname", + "containername", "listname", +}; + +/* 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 Queries[] = { + { + /* Q_GALO - GET_ALL_LOGINS, v2 */ + "get_all_logins", + "galo", + 2, + MR_Q_RETRIEVE, + "u", + 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, + "u.login", + 0, + }, + + { + /* Q_GALO - GET_ALL_LOGINS, v3 */ + "get_all_logins", + "galo", + 3, + MR_Q_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.users_id != 0", + 0, + "u.login", + 0, + }, + + { + /* Q_GAAL - GET_ALL_ACTIVE_LOGINS, v2 */ + "get_all_active_logins", + "gaal", + 2, + MR_Q_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, + "u.login", + 0, + }, + + { + /* Q_GAAL - GET_ALL_ACTIVE_LOGINS, v3 */ + "get_all_active_logins", + "gaal", + 3, + MR_Q_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, v2 */ + "get_user_account_by_login", + "gual", + 2, + MR_Q_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", + gual2_fields, + 15, + "u.login LIKE '%s' AND u.users_id != 0 AND u.comments = str.string_id", + 1, + "u.login", + &gubl2_validate, + }, + + { + /* Q_GUAL - GET_USER_ACCOUNT_BY_LOGIN, v3 */ + "get_user_account_by_login", + "gual", + 3, + MR_Q_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, TO_CHAR(u.created, 'DD-mon-YYYY HH24:MI:SS'), u.creator FROM users u, strings str", + gual3_fields, + 18, + "u.login LIKE '%s' AND u.users_id != 0 AND u.comments = str.string_id", + 1, + "u.login", + &gubl_validate, + }, + + { + /* Q_GUAL - GET_USER_ACCOUNT_BY_LOGIN, v11 */ + "get_user_account_by_login", + "gual", + 11, + MR_Q_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, u.winhomedir, u.winprofiledir, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith, TO_CHAR(u.created, 'DD-mon-YYYY HH24:MI:SS'), u.creator FROM users u, strings str", + gual11_fields, + 20, + "u.login LIKE '%s' AND u.users_id != 0 AND u.comments = str.string_id", + 1, + "u.login", + &gubl_validate, + }, + + { + /* Q_GUAL - GET_USER_ACCOUNT_BY_LOGIN, v12 */ + "get_user_account_by_login", + "gual", + 12, + MR_Q_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, u.winhomedir, u.winprofiledir, u.sponsor_type, u.sponsor_id, u.expiration, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith, TO_CHAR(u.created, 'DD-mon-YYYY HH24:MI:SS'), u.creator FROM users u, strings str", + gual_fields, + 23, + "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, + MR_Q_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", + guau2_fields, + 15, + "u.unix_uid = %s AND u.users_id != 0 AND u.comments = str.string_id", + 1, + "u.login", + &gubu2_validate, + }, + + { + /* Q_GUAU - GET_USER_ACCOUNT_BY_UID, v3 */ + "get_user_account_by_uid", + "guau", + 3, + MR_Q_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, TO_CHAR(u.created, 'DD-mon-YYYY HH24:MI:SS'), u.creator FROM users u, strings str", + guau3_fields, + 18, + "u.unix_uid = %s AND u.users_id != 0 AND u.comments = str.string_id", + 1, + "u.login", + &gubu_validate, + }, + + { + /* Q_GUAU - GET_USER_ACCOUNT_BY_UID, v11 */ + "get_user_account_by_uid", + "guau", + 11, + MR_Q_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, u.winhomedir, u.winprofiledir, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith, TO_CHAR(u.created, 'DD-mon-YYYY HH24:MI:SS'), u.creator FROM users u, strings str", + guau3_fields, + 20, + "u.unix_uid = %s AND u.users_id != 0 AND u.comments = str.string_id", + 1, + "u.login", + &gubu_validate, + }, + + { + /* Q_GUAU - GET_USER_ACCOUNT_BY_UID, v12 */ + "get_user_account_by_uid", + "guau", + 12, + MR_Q_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, u.winhomedir, u.winprofiledir, u.sponsor_type, u.sponsor_id, u.expiration, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith, TO_CHAR(u.created, 'DD-mon-YYYY HH24:MI:SS'), u.creator FROM users u, strings str", + guau_fields, + 23, + "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", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "u", USERS_TABLE, - "u.login, u.unix_uid, u.shell, u.last, u.first, u.middle, u.status, u.clearid, u.type, str.string, u.signature, u.secure, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith FROM users u, strings str", - guan_fields, + "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' AND u.last LIKE '%s' AND u.users_id != 0 and u.comments = str.string_id", 2, "u.login", + &guan2_validate, + }, + + { + /* Q_GUAN - GET_USER_ACCOUNT_BY_NAME, v3 */ + "get_user_account_by_name", + "guan", + 3, + MR_Q_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, TO_CHAR(u.created, 'DD-mon-YYYY HH24:MI:SS'), u.creator FROM users u, strings str", + guan3_fields, + 18, + "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, v11 */ + "get_user_account_by_name", + "guan", + 11, + MR_Q_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, u.winhomedir, u.winprofiledir, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith, TO_CHAR(u.created, 'DD-mon-YYYY HH24:MI:SS'), u.creator FROM users u, strings str", + guan11_fields, + 20, + "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_GUAN - GET_USER_ACCOUNT_BY_NAME, v12 */ + "get_user_account_by_name", + "guan", + 12, + MR_Q_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, u.winhomedir, u.winprofiledir, u.sponsor_type, u.sponsor_id, u.expiration, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith, TO_CHAR(u.created, 'DD-mon-YYYY HH24:MI:SS'), u.creator FROM users u, strings str", + guan_fields, + 23, + "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", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "u", USERS_TABLE, - "u.login, u.unix_uid, u.shell, u.last, u.first, u.middle, u.status, u.clearid, u.type, str.string, u.signature, u.secure, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith FROM users u, strings str", - guac_fields, + "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, @@ -2385,14 +4243,66 @@ struct query Queries2[] = { }, { - /* Q_GUAM - GET_USER_ACCOUNT_BY_MITID */ + /* Q_GUAC - GET_USER_ACCOUNT_BY_CLASS, v3 */ + "get_user_account_by_class", + "guac", + 3, + MR_Q_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, TO_CHAR(u.created, 'DD-mon-YYYY HH24:MI:SS'), u.creator FROM users u, strings str", + guac3_fields, + 18, + "u.type = UPPER('%s') AND u.users_id != 0 AND u.comments = str.string_id", + 1, + "u.login", + &guan_validate, + }, + + { + /* Q_GUAC - GET_USER_ACCOUNT_BY_CLASS, v11 */ + "get_user_account_by_class", + "guac", + 11, + MR_Q_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, u.winhomedir, u.winprofiledir, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith, TO_CHAR(u.created, 'DD-mon-YYYY HH24:MI:SS'), u.creator FROM users u, strings str", + guac11_fields, + 20, + "u.type = UPPER('%s') AND u.users_id != 0 AND u.comments = str.string_id", + 1, + "u.login", + &guan_validate, + }, + + { + /* Q_GUAC - GET_USER_ACCOUNT_BY_CLASS, v12 */ + "get_user_account_by_class", + "guac", + 12, + MR_Q_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, u.winhomedir, u.winprofiledir, u.sponsor_type, u.sponsor_id, u.expiration, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith, TO_CHAR(u.created, 'DD-mon-YYYY HH24:MI:SS'), u.creator FROM users u, strings str", + guac_fields, + 23, + "u.type = UPPER('%s') AND u.users_id != 0 AND u.comments = str.string_id", + 1, + "u.login", + &guan_validate, + }, + + { + /* Q_GUAM - GET_USER_ACCOUNT_BY_MITID, v2 */ "get_user_account_by_id", "guai", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "u", USERS_TABLE, - "u.login, u.unix_uid, u.shell, u.last, u.first, u.middle, u.status, u.clearid, u.type, str.string, u.signature, u.secure, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith FROM users u, strings str", - guam_fields, + "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.clearid LIKE '%s' AND u.users_id != 0 AND u.comments = str.string_id", 1, @@ -2401,47 +4311,169 @@ struct query Queries2[] = { }, { - /* Q_GUBL - GET_USER_BY_LOGIN */ + /* Q_GUAM - GET_USER_ACCOUNT_BY_MITID, v3 */ + "get_user_account_by_id", + "guai", + 3, + MR_Q_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, TO_CHAR(u.created, 'DD-mon-YYYY HH24:MI:SS'), u.creator FROM users u, strings str", + guam_fields, + 18, + "u.clearid LIKE '%s' AND u.users_id != 0 AND u.comments = str.string_id", + 1, + "u.login", + &guan_validate, + }, + + { + /* Q_GUAM - GET_USER_ACCOUNT_BY_MITID, v11 */ + "get_user_account_by_id", + "guai", + 11, + MR_Q_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, u.winhomedir, u.winprofiledir, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith, TO_CHAR(u.created, 'DD-mon-YYYY HH24:MI:SS'), u.creator FROM users u, strings str", + guam11_fields, + 20, + "u.clearid LIKE '%s' AND u.users_id != 0 AND u.comments = str.string_id", + 1, + "u.login", + &guan_validate, + }, + + { + /* Q_GUAM - GET_USER_ACCOUNT_BY_MITID, v12 */ + "get_user_account_by_id", + "guai", + 12, + MR_Q_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, u.winhomedir, u.winprofiledir, u.sponsor_type, u.sponsor_id, u.expiration, TO_CHAR(u.modtime, 'DD-mon-YYYY HH24:MI:SS'), u.modby, u.modwith, TO_CHAR(u.created, 'DD-mon-YYYY HH24:MI:SS'), u.creator FROM users u, strings str", + guam_fields, + 23, + "u.clearid LIKE '%s' AND u.users_id != 0 AND u.comments = str.string_id", + 1, + "u.login", + &guan_validate, + }, + + { + /* Q_GUAS - GET_USER_ACCOUNT_BY_SPONSOR, v12 */ + "get_user_account_by_sponsor", + "guas", + 12, + MR_Q_RETRIEVE, + 0, + 0, + 0, + guas_fields, + 1, + 0, + 2, + NULL, + &guas_validate, + }, + + { + /* Q_GUBL - GET_USER_BY_LOGIN, v2 */ "get_user_by_login", "gubl", - RETRIEVE, + 2, + MR_Q_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", - gubl_fields, + gubl2_fields, 12, "u.login LIKE '%s' AND u.users_id != 0", 1, "u.login", + &gubl2_validate, + }, + + { + /* Q_GUBL - GET_USER_BY_LOGIN, v3 */ + "get_user_by_login", + "gubl", + 3, + MR_Q_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, TO_CHAR(u.created, 'DD-mon-YYYY HH24:MI:SS'), u.creator FROM users u", + gubl_fields, + 15, + "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", - RETRIEVE, + 2, + MR_Q_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", - gubu_fields, + gubu2_fields, 12, "u.unix_uid = %s AND u.users_id != 0", 1, "u.login", - &gubu_validate, + &gubu2_validate, + }, + + { + /* Q_GUBU - GET_USER_BY_UID, v3 */ + "get_user_by_uid", + "gubu", + 3, + MR_Q_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, TO_CHAR(u.created, 'DD-mon-YYYY HH24:MI:SS'), u.creator FROM users u", + gubu_fields, + 15, + "u.unix_uid = %s AND u.users_id != 0", + 1, + "u.login", + &gubu_validate, + }, + + { + /* Q_GUBN - GET_USER_BY_NAME, v2 */ + "get_user_by_name", + "gubn", + 2, + MR_Q_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", + gubn2_fields, + 12, + "u.first LIKE '%s' AND u.last LIKE '%s' AND u.users_id != 0", + 2, + "u.login", + &gubn2_validate, }, { - /* Q_GUBN - GET_USER_BY_NAME */ + /* Q_GUBN - GET_USER_BY_NAME, v3 */ "get_user_by_name", "gubn", - RETRIEVE, + 3, + MR_Q_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", + "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, TO_CHAR(u.created, 'DD-mon-YYYY HH24:MI:SS'), u.creator FROM users u", gubn_fields, - 12, + 15, "u.first LIKE '%s' AND u.last LIKE '%s' AND u.users_id != 0", 2, "u.login", @@ -2449,14 +4481,15 @@ struct query Queries2[] = { }, { - /* Q_GUBC - GET_USER_BY_CLASS */ + /* Q_GUBC - GET_USER_BY_CLASS, v2 */ "get_user_by_class", "gubc", - RETRIEVE, + 2, + MR_Q_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", - gubc_fields, + gubc2_fields, 12, "u.type = UPPER('%s') AND u.users_id != 0", 1, @@ -2465,14 +4498,32 @@ struct query Queries2[] = { }, { - /* Q_GUBM - GET_USER_BY_MITID */ + /* Q_GUBC - GET_USER_BY_CLASS, v3 */ + "get_user_by_class", + "gubc", + 3, + MR_Q_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, TO_CHAR(u.created, 'DD-mon-YYYY HH24:MI:SS') FROM users u", + gubc_fields, + 15, + "u.type = UPPER('%s') AND u.users_id != 0", + 1, + "u.login", + &guan_validate, + }, + + { + /* Q_GUBM - GET_USER_BY_MITID, v2 */ "get_user_by_mitid", "gubm", - RETRIEVE, + 2, + MR_Q_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", - gubm_fields, + gubm2_fields, 12, "u.clearid LIKE '%s' AND u.users_id != 0", 1, @@ -2481,31 +4532,96 @@ struct query Queries2[] = { }, { - /* Q_GUDF - GET_USER_DIRECTORY_FLAGS */ - "get_user_directory_flags", - "gudf", - RETRIEVE, + /* Q_GUBM - GET_USER_BY_MITID, v3 */ + "get_user_by_mitid", + "gubm", + 3, + MR_Q_RETRIEVE, "u", USERS_TABLE, - "u.dirsuppress, u.dirremote FROM users u", - gudf_fields, - 2, - "u.users_id = %d", + "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, TO_CHAR(u.created, 'DD-mon-YYYY HH24:MI:SS'), u.creator FROM users u", + gubm_fields, + 15, + "u.clearid LIKE '%s' AND u.users_id != 0", 1, + "u.login", + &guan_validate, + }, + + { + /* Q_AUAC - ADD_USER_ACCOUNT, v2 */ /* uses prefetch_value() for users_id */ + "add_user_account", + "auac", + 2, + MR_Q_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, 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, NULL, - &gudf_validate, + 0, + NULL, + &auac2_validate, }, { - /* Q_AUAC - ADD_USER_ACCOUNT */ /* uses prefetch_value() for users_id */ + /* Q_AUAC - ADD_USER_ACCOUNT, v3 */ /* uses prefetch_value() for users_id */ "add_user_account", "auac", - APPEND, + 3, + MR_Q_APPEND, "u", USERS_TABLE, - "INTO users (login, unix_uid, shell, last, first, middle, status, clearid, type, comments, signature, secure, users_id) VALUES ('%s', %s, '%s', NVL('%s', CHR(0)), NVL('%s', CHR(0)), NVL('%s', CHR(0)), %s, NVL('%s', CHR(0)), '%s', %d, LENGTH(NVL('%s', CHR(0))), %s, %s)", /* followup_ausr fixes signature field */ - auac_fields, + /* 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, created, creator) 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, SYSDATE, %s)", + auac3_fields, + 13, + NULL, + 0, + NULL, + &auac3_validate, + }, + + { + /* Q_AUAC - ADD_USER_ACCOUNT, v11 */ /* uses prefetch_value() for users_id */ + "add_user_account", + "auac", + 11, + MR_Q_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, winhomedir, winprofiledir, users_id, created, creator) 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, NVL('%s', CHR(0)), NVL('%s', CHR(0)), %s, SYSDATE, %s)", + auac11_fields, + 15, + NULL, + 0, + NULL, + &auac11_validate, + }, + + { + /* Q_AUAC - ADD_USER_ACCOUNT, v12 */ /* uses prefetch_value() for users_id */ + "add_user_account", + "auac", 12, + MR_Q_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, winhomedir, winprofiledir, sponsor_type, sponsor_id, expiration, users_id, created, creator) 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, NVL('%s', CHR(0)), NVL('%s', CHR(0)), '%s', %d, NVL('%s', CHR(0)), %s, SYSDATE, %s)", + auac_fields, + 18, NULL, 0, NULL, @@ -2513,18 +4629,70 @@ struct query Queries2[] = { }, { - /* Q_AUSR - ADD_USER */ /* uses prefetch_value() for users_id */ + /* Q_AUSR - ADD_USER, v2 */ /* uses prefetch_value() for users_id */ "add_user", "ausr", - APPEND, + 2, + MR_Q_APPEND, "u", USERS_TABLE, "INTO users (login, unix_uid, shell, last, first, middle, status, clearid, type, comments, signature, secure, users_id) VALUES ('%s', %s, '%s', NVL('%s', CHR(0)), NVL('%s', CHR(0)), NVL('%s', CHR(0)), %s, NVL('%s', CHR(0)), '%s', 0, CHR(0), 0, %s)", - auac_fields, + auac2_fields, 9, 0, 0, NULL, + &ausr2_validate, + }, + + { + /* Q_AUSR - ADD_USER, v3 */ /* uses prefetch_value() for users_id */ + "add_user", + "ausr", + 3, + MR_Q_APPEND, + "u", + USERS_TABLE, + "INTO users (login, unix_uid, shell, winconsoleshell, last, first, middle, status, clearid, type, comments, signature, secure, users_id, created, creator) 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, SYSDATE, %s)", + auac3_fields, + 10, + 0, + 0, + NULL, + &ausr3_validate, + }, + + { + /* Q_AUSR - ADD_USER, v11 */ /* uses prefetch_value() for users_id */ + "add_user", + "ausr", + 11, + MR_Q_APPEND, + "u", + USERS_TABLE, + "INTO users (login, unix_uid, shell, winconsoleshell, last, first, middle, status, clearid, type, comments, signature, secure, winhomedir, winprofiledir, users_id, created, creator) 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, NVL('%s', CHR(0)), NVL('%s', CHR(0)), %s, SYSDATE, %s)", + auac11_fields, + 12, + 0, + 0, + NULL, + &ausr11_validate, + }, + + { + /* Q_AUSR - ADD_USER, v12 */ /* uses prefetch_value() for users_id */ + "add_user", + "ausr", + 12, + MR_Q_APPEND, + "u", + USERS_TABLE, + "INTO users (login, unix_uid, shell, winconsoleshell, last, first, middle, status, clearid, type, comments, signature, secure, winhomedir, winprofiledir, sponsor_type, sponsor_id, expiration, users_id, created, creator) 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, NVL('%s', CHR(0)), NVL('%s', CHR(0)), '%s', %d, NVL('%s', CHR(0)), %s, SYSDATE, %s)", + auac_fields, + 15, + 0, + 0, + NULL, &ausr_validate, }, @@ -2532,7 +4700,8 @@ struct query Queries2[] = { /* Q_RUSR - REGISTER_USER */ "register_user", "rusr", - APPEND, + 2, + MR_Q_APPEND, 0, 0, 0, @@ -2545,15 +4714,71 @@ struct query Queries2[] = { }, { - /* Q_UUAC - UPDATE_USER_ACCOUNT */ + /* Q_UUAC - UPDATE_USER_ACCOUNT, v2 */ "update_user_account", "uuac", - UPDATE, + 2, + MR_Q_UPDATE, "u", USERS_TABLE, - "users SET login = '%s', unix_uid = %s, shell = '%s', last = NVL('%s', CHR(0)), first = NVL('%s', CHR(0)), middle = NVL('%s', CHR(0)), status = %s, clearid = NVL('%s', CHR(0)), type = '%s', comments = %d, signature = LENGTH(NVL('%s', CHR(0))), secure = %s", /* followup_uuac fixes signature */ - uuac_fields, + /* 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, + MR_Q_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", + uuac3_fields, + 13, + "users_id = %d", + 1, + NULL, + &uuac3_validate, + }, + + { + /* Q_UUAC - UPDATE_USER_ACCOUNT, v11 */ + "update_user_account", + "uuac", + 11, + MR_Q_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, winhomedir = NVL('%s', CHR(0)), winprofiledir = NVL('%s', CHR(0))", + uuac11_fields, + 15, + "users_id = %d", + 1, + NULL, + &uuac11_validate, + }, + + { + /* Q_UUAC - UPDATE_USER_ACCOUNT, v12 */ + "update_user_account", + "uuac", 12, + MR_Q_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, winhomedir = NVL('%s', CHR(0)), winprofiledir = NVL('%s', CHR(0)), sponsor_type = '%s', sponsor_id = %d, expiration = NVL('%s', CHR(0))", + uuac_fields, + 18, "users_id = %d", 1, NULL, @@ -2561,18 +4786,70 @@ struct query Queries2[] = { }, { - /* Q_UUSR - UPDATE_USER */ + /* Q_UUSR - UPDATE_USER, v2 */ "update_user", "uusr", - UPDATE, + 2, + MR_Q_UPDATE, "u", USERS_TABLE, "users SET login = '%s', unix_uid = %s, shell = '%s', last = NVL('%s', CHR(0)), first = NVL('%s', CHR(0)), middle = NVL('%s', CHR(0)), status = %s, clearid = NVL('%s', CHR(0)), type = '%s'", - uuac_fields, + uuac2_fields, 9, "users_id = %d", 1, NULL, + &uusr2_validate, + }, + + { + /* Q_UUSR - UPDATE_USER, v3 */ + "update_user", + "uusr", + 3, + MR_Q_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'", + uuac3_fields, + 10, + "users_id = %d", + 1, + NULL, + &uusr3_validate, + }, + + { + /* Q_UUSR - UPDATE_USER, v11 */ + "update_user", + "uusr", + 11, + MR_Q_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', winhomedir = NVL('%s', CHR(0)), winprofiledir = NVL('%s', CHR(0)) ", + uuac11_fields, + 12, + "users_id = %d", + 1, + NULL, + &uusr11_validate, + }, + + { + /* Q_UUSR - UPDATE_USER, v12 */ + "update_user", + "uusr", + 12, + MR_Q_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', winhomedir = NVL('%s', CHR(0)), winprofiledir = NVL('%s', CHR(0)), sponsor_type = '%s', sponsor_id = %d, expiration = NVL('%s', CHR(0)) ", + uuac_fields, + 15, + "users_id = %d", + 1, + NULL, &uusr_validate, }, @@ -2580,7 +4857,8 @@ struct query Queries2[] = { /* Q_UUSH - UPDATE_USER_SHELL */ "update_user_shell", "uush", - UPDATE, + 2, + MR_Q_UPDATE, "u", USERS_TABLE, "users SET shell = '%s'", @@ -2592,11 +4870,29 @@ struct query Queries2[] = { &uush_validate, }, + { + /* Q_UUWS - UPDATE_USER_WINDOWS_SHELL */ + "update_user_windows_shell", + "uuws", + 2, + MR_Q_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", - UPDATE, + 2, + MR_Q_UPDATE, "u", USERS_TABLE, "users SET status = %s", @@ -2612,7 +4908,8 @@ struct query Queries2[] = { /* Q_UUSS - UPDATE_USER_SECURITY_STATUS */ "update_user_security_status", "uuss", - UPDATE, + 2, + MR_Q_UPDATE, "u", USERS_TABLE, "users SET secure = %s", @@ -2624,27 +4921,12 @@ struct query Queries2[] = { &uust_validate, }, - { - /* Q_UUDF - UPDATE_USER_DIRECTORY_FLAGS */ - "update_user_directory_flags", - "uudf", - UPDATE, - "u", - USERS_TABLE, - "users SET dirsuppress = %s, dirremote = %s", - uudf_fields, - 2, - "users_id = %d", - 1, - NULL, - &uudf_validate, - }, - { /* Q_DUSR - DELETE_USER */ "delete_user", "dusr", - DELETE, + 2, + MR_Q_DELETE, "u", USERS_TABLE, NULL, @@ -2657,26 +4939,79 @@ struct query Queries2[] = { }, { - /* Q_DUBU - DELETE_USER_BY_UID */ - "delete_user_by_uid", - "dubu", - DELETE, - "u", + /* Q_AURV - ADD_USER_RESERVATION */ + "add_user_reservation", + "aurv", + 2, + MR_Q_UPDATE, + 0, USERS_TABLE, + 0, + aurv_fields, + 2, + 0, + 0, NULL, - dubu_fields, + &aurv_validate, + }, + + { + /* Q_GURV - GET_USER_RESERVATIONS */ + "get_user_reservations", + "gurv", + 2, + MR_Q_RETRIEVE, + 0, + USERS_TABLE, + 0, + gurv_fields, + 2, + 0, + 1, + NULL, + &gurv_validate, + }, + + { + /* Q_GUBR - GET_USER_BY_RESERVATION */ + "get_user_by_reservation", + "gubr", + 2, + MR_Q_RETRIEVE, + 0, + USERS_TABLE, + 0, + gubr_fields, + 1, 0, - "users_id = %d", 1, NULL, - &dubu_validate, + &gubr_validate, + }, + + { + /* Q_DURV - DELETE_USER_RESERVATION */ + "delete_user_reservation", + "durv", + 2, + MR_Q_UPDATE, + 0, + USERS_TABLE, + 0, + aurv_fields, + 2, + 0, + 0, + NULL, + &aurv_validate, }, { /* Q_GKUM - GET_KERBEROS_USER_MAP */ "get_kerberos_user_map", "gkum", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "k", KRBMAP_TABLE, "u.login, str.string FROM krbmap km, users u, strings str", @@ -2692,7 +5027,8 @@ struct query Queries2[] = { /* Q_AKUM - ADD_KERBEROS_USER_MAP */ "add_kerberos_user_map", "akum", - APPEND, + 2, + MR_Q_APPEND, "k", KRBMAP_TABLE, "INTO krbmap (users_id, string_id) VALUES (%d, %d)", @@ -2708,7 +5044,8 @@ struct query Queries2[] = { /* Q_DKUM - DELETE_KERBEROS_USER_MAP */ "delete_kerberos_user_map", "dkum", - DELETE, + 2, + MR_Q_DELETE, "k", KRBMAP_TABLE, 0, @@ -2724,7 +5061,8 @@ struct query Queries2[] = { /* Q_GFBL - GET_FINGER_BY_LOGIN */ "get_finger_by_login", "gfbl", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "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", @@ -2740,7 +5078,8 @@ struct query Queries2[] = { /* Q_UFBL - UPDATE_FINGER_BY_LOGIN */ "update_finger_by_login", "ufbl", - UPDATE, + 2, + MR_Q_UPDATE, "u", 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))", @@ -2756,12 +5095,13 @@ struct query Queries2[] = { /* Q_GPOB - GET_POBOX */ "get_pobox", "gpob", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "u", USERS_TABLE, - "login, potype, pop_id || ':' || box_id, TO_CHAR(pmodtime, 'DD-mon-YYYY HH24:MI:SS'), pmodby, pmodwith FROM users", + "login, potype, users_id, CHR(0), TO_CHAR(pmodtime, 'DD-mon-YYYY HH24:MI:SS'), pmodby, pmodwith FROM users", gpob_fields, - 6, + 7, "users_id = %d", 1, "login", @@ -2772,7 +5112,8 @@ struct query Queries2[] = { /* Q_GAPO - GET_ALL_POBOXES */ "get_all_poboxes", "gapo", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "u", USERS_TABLE, "login, potype, pop_id || ':' || box_id FROM users", @@ -2788,10 +5129,11 @@ struct query Queries2[] = { /* Q_GPOP - GET_POBOXES_POP */ "get_poboxes_pop", "gpop", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "u", USERS_TABLE, - "login, potype, pop_id || ':' || box_id FROM users", + "login, potype, users_id FROM users", gpox_fields, 3, "potype = 'POP'", @@ -2804,10 +5146,11 @@ struct query Queries2[] = { /* Q_GPOF - GET_POBOXES_SMTP */ "get_poboxes_smtp", "gpos", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "u", USERS_TABLE, - "login, potype, pop_id || ':' || box_id FROM users", + "login, potype, users_id FROM users", gpox_fields, 3, "potype = 'SMTP'", @@ -2820,7 +5163,8 @@ struct query Queries2[] = { /* Q_SPOB - SET_POBOX */ "set_pobox", "spob", - UPDATE, + 2, + MR_Q_UPDATE, 0, USERS_TABLE, 0, @@ -2836,15 +5180,16 @@ struct query Queries2[] = { /* Q_SPOP - SET_POBOX_POP */ "set_pobox_pop", "spop", - UPDATE, - "u", + 2, + MR_Q_UPDATE, + 0, USERS_TABLE, - "users SET potype = 'POP'", - spob_fields, 0, - "users_id = %d", + spob_fields, 1, NULL, + 0, + NULL, &spop_validate, }, @@ -2852,7 +5197,8 @@ struct query Queries2[] = { /* Q_DPOB - DELETE_POBOX */ "delete_pobox", "dpob", - UPDATE, + 2, + MR_Q_UPDATE, "u", USERS_TABLE, "users SET potype = 'NONE'", @@ -2865,58 +5211,266 @@ struct query Queries2[] = { }, { - /* Q_GHST - GET_HOST */ + /* Q_GHST - GET_HOST, v2 */ "get_host", "ghst", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "m", MACHINE_TABLE, "m.name, m.vendor, m.model, m.os, m.location, m.contact, m.use, m.status, TO_CHAR(m.statuschange, 'DD-mon-YYYY HH24:MI:SS'), s.name, m.address, m.owner_type, m.owner_id, m.acomment, m.ocomment, TO_CHAR(m.created, 'DD-mon-YYYY HH24:MI:SS'), m.creator, TO_CHAR(m.inuse, 'DD-mon-YYYY HH24:MI:SS'), TO_CHAR(m.modtime, 'DD-mon-YYYY HH24:MI:SS'), m.modby, m.modwith FROM machine m, subnet s", - ghst_fields, + ghst2_fields, 21, - "m.name LIKE UPPER('%s') AND m.address LIKE '%s' AND m.location LIKE '%s' AND s.name LIKE UPPER('%s') AND m.mach_id != 0 AND s.snet_id = m.snet_id", + "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, v6 */ + "get_host", + "ghst", + 6, + MR_Q_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", + ghst6_fields, + 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_GHST - GET_HOST, v8 */ + "get_host", + "ghst", + 8, + MR_Q_RETRIEVE, + "m", + MACHINE_TABLE, + "m.name, m.vendor, m.model, m.os, m.location, m.contact, m.billing_contact, m.account_number, 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, + 23, + "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, + MR_Q_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, + MR_Q_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", + ghbh6_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_GHBH - GET_HOST_BY_HWADDR, v8 */ + "get_host_by_hwaddr", + "ghbh", + 8, + MR_Q_RETRIEVE, + "m", + MACHINE_TABLE, + "m.name, m.vendor, m.model, m.os, m.location, m.contact, m.billing_contact, m.account_number, 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, + 23, + "m.hwaddr LIKE LOWER('%s') AND m.mach_id != 0 AND s.snet_id = m.snet_id", + 1, + "m.name", + &ghst_validate, + }, + + { + /* Q_GHBA - GET_HOST_BY_ACCOUNT_NUMBER, v8 */ + "get_host_by_account_number", + "ghba", + 8, + MR_Q_RETRIEVE, + "m", + MACHINE_TABLE, + "m.name, m.vendor, m.model, m.os, m.location, m.contact, m.billing_contact, m.account_number, 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", + ghba_fields, + 23, + "m.account_number LIKE '%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, + MR_Q_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", - APPEND, + 2, + MR_Q_APPEND, "m", MACHINE_TABLE, "INTO machine (name, vendor, model, os, location, contact, use, status, statuschange, snet_id, address, owner_type, owner_id, acomment, ocomment, created, inuse, mach_id, creator) VALUES (UPPER('%s'), NVL(UPPER('%s'), CHR(0)), NVL(UPPER('%s'), CHR(0)), NVL(UPPER('%s'), CHR(0)), NVL(UPPER('%s'), CHR(0)), NVL('%s', CHR(0)), %s, %s, SYSDATE, %d, '%s', '%s', %d, %d, %d, SYSDATE, SYSDATE, %s, %s)", - ahst_fields, + ahst2_fields, 14, 0, 0, NULL, + &ahst2_validate, + }, + + { + /* Q_AHST - ADD_HOST, v6 */ /* uses prefetch_value() for mach_id */ + "add_host", + "ahst", + 6, + MR_Q_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)", + ahst6_fields, + 15, + 0, + 0, + NULL, + &ahst6_validate, + }, + + { + /* Q_AHST - ADD_HOST, v8 */ /* Uses prefetch_value() for mach_id */ + "add_host", + "ahst", + 8, + MR_Q_APPEND, + "m", + MACHINE_TABLE, + "INTO machine (name, vendor, model, os, location, contact, billing_contact, account_number, 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)), NVL('%s', CHR(0)), %s, %s, SYSDATE, %d, '%s', '%s', %d, %d, %d, SYSDATE, SYSDATE, %s, %s)", + ahst_fields, + 16, + 0, + 0, + NULL, &ahst_validate, }, { - /* Q_UHST - UPDATE_HOST */ + /* Q_UHST - UPDATE_HOST, v2 */ "update_host", "uhst", - UPDATE, + 2, + MR_Q_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)), use = %s, status = %s, snet_id = %d, address = '%s', owner_type = '%s', owner_id = %d, acomment = %d, ocomment = %d", - uhst_fields, + uhst2_fields, 14, "mach_id = %d", 1, NULL, + &uhst2_validate, + }, + + { + /* Q_UHST - UPDATE_HOST, v6 */ + "update_host", + "uhst", + 6, + MR_Q_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", + uhst6_fields, + 15, + "mach_id = %d", + 1, + NULL, + &uhst6_validate, + }, + + { + /* Q_UHST - UPDATE_HOST, v8 */ + "update_host", + "uhst", + 8, + MR_Q_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)), account_number = 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, + 16, + "mach_id = %d", + 1, + NULL, &uhst_validate, }, + { + /* Q_UHHA - UPDATE_HOST_HWADDR */ + "update_host_hwaddr", + "uhha", + 2, + MR_Q_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", - DELETE, + 2, + MR_Q_DELETE, "m", MACHINE_TABLE, NULL, @@ -2932,7 +5486,8 @@ struct query Queries2[] = { /* Q_GMAC - GET_MACHINE */ "get_machine", "gmac", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "m", MACHINE_TABLE, "name, vendor, TO_CHAR(modtime, 'DD-mon-YYYY HH24:MI:SS'), modby, modwith FROM machine", @@ -2948,7 +5503,8 @@ struct query Queries2[] = { /* Q_GHAL - GET_HOSTALIAS */ "get_hostalias", "ghal", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "a", HOSTALIAS_TABLE, "a.name, m.name FROM hostalias a, machine m", @@ -2964,7 +5520,8 @@ struct query Queries2[] = { /* Q_AHAL - ADD_HOSTALIAS */ "add_hostalias", "ahal", - APPEND, + 2, + MR_Q_APPEND, "a", HOSTALIAS_TABLE, "INTO hostalias (name, mach_id) VALUES (UPPER('%s'), %d)", @@ -2980,7 +5537,8 @@ struct query Queries2[] = { /* Q_DHAL - DELETE_HOSTALIAS */ "delete_hostalias", "dhal", - DELETE, + 2, + MR_Q_DELETE, "a", HOSTALIAS_TABLE, NULL, @@ -2993,50 +5551,104 @@ struct query Queries2[] = { }, { - /* Q_GSNT - GET_SUBNET */ + /* Q_GSNT - GET_SUBNET, v2 */ "get_subnet", "gsnt", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "s", SUBNET_TABLE, "name, description, saddr, mask, low, high, prefix, owner_type, owner_id, TO_CHAR(modtime, 'DD-mon-YYYY HH24:MI:SS'), modby, modwith FROM subnet", - gsnt_fields, + gsnt2_fields, 12, - "name LIKE UPPER('%s') and snet_id != 0", + "name LIKE UPPER('%s')", + 1, + "name", + &gsnt_validate, + }, + + { + /* Q_GSNT - GET_SUBNET, v8 */ + "get_subnet", + "gsnt", + 8, + MR_Q_RETRIEVE, + "s", + SUBNET_TABLE, + "name, description, status, contact, account_number, saddr, mask, low, high, prefix, owner_type, owner_id, TO_CHAR(modtime, 'DD-mon-YYYY HH24:MI:SS'), modby, modwith FROM subnet", + gsnt_fields, + 15, + "name LIKE UPPER('%s')", 1, "name", &gsnt_validate, }, { - /* Q_ASNT - ADD_SUBNET */ + /* Q_ASNT - ADD_SUBNET, v2 */ "add_subnet", "asnt", - APPEND, + 2, + MR_Q_APPEND, "s", SUBNET_TABLE, "INTO subnet (name, description, saddr, mask, low, high, prefix, owner_type, owner_id, snet_id) VALUES (UPPER('%s'), NVL('%s', CHR(0)), %s, %s, %s, %s, NVL('%s', CHR(0)), '%s', %d, %s)", - asnt_fields, + asnt2_fields, 9, 0, 0, NULL, + &asnt2_validate, + }, + + { + /* Q_ASNT - ADD_SUBNET, v8 */ + "add_subnet", + "asnt", + 8, + MR_Q_APPEND, + "s", + SUBNET_TABLE, + "INTO subnet (name, description, status, contact, account_number, saddr, mask, low, high, prefix, owner_type, owner_id, snet_id) VALUES (UPPER('%s'), NVL('%s', CHR(0)), %s, NVL('%s', CHR(0)), NVL('%s', CHR(0)), %s, %s, %s, %s, NVL('%s', CHR(0)), '%s', %d, %s)", + asnt_fields, + 12, + 0, + 0, + NULL, &asnt_validate, }, { - /* Q_USNT - UPDATE_SUBNET */ + /* Q_USNT - UPDATE_SUBNET, v2 */ "update_subnet", "usnt", - UPDATE, + 2, + MR_Q_UPDATE, "s", SUBNET_TABLE, "subnet SET name = UPPER('%s'), description = NVL('%s', CHR(0)), saddr = %s, mask = %s, low = %s, high = %s, prefix = NVL('%s', CHR(0)), owner_type = '%s', owner_id = %d", - usnt_fields, + usnt2_fields, 9, "snet_id = %d", 1, NULL, + &usnt2_validate, + }, + + { + /* Q_USNT - UPDATE_SUBNET, v8 */ + "update_subnet", + "usnt", + 8, + MR_Q_UPDATE, + "s", + SUBNET_TABLE, + "subnet SET name = UPPER('%s'), description = NVL('%s', CHR(0)), status = %s, contact = NVL('%s', CHR(0)), account_number = 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, + 12, + "snet_id = %d", + 1, + NULL, &usnt_validate, }, @@ -3044,7 +5656,8 @@ struct query Queries2[] = { /* Q_DSNT - DELETE_SUBNET */ "delete_subnet", "dsnt", - DELETE, + 2, + MR_Q_DELETE, "s", SUBNET_TABLE, NULL, @@ -3060,7 +5673,8 @@ struct query Queries2[] = { /* Q_GCLU - GET_CLUSTER */ "get_cluster", "gclu", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "c", CLUSTERS_TABLE, "name, description, location, TO_CHAR(modtime, 'DD-mon-YYYY HH24:MI:SS'), modby, modwith FROM clusters", @@ -3076,7 +5690,8 @@ struct query Queries2[] = { /* Q_ACLU - ADD_CLUSTER */ /* uses prefetch_value() for clu_id */ "add_cluster", "aclu", - APPEND, + 2, + MR_Q_APPEND, "c", CLUSTERS_TABLE, "INTO clusters (name, description, location, clu_id) VALUES ('%s', NVL('%s', CHR(0)), NVL('%s', CHR(0)), %s)", @@ -3092,7 +5707,8 @@ struct query Queries2[] = { /* Q_UCLU - UPDATE_CLUSTER */ "update_cluster", "uclu", - UPDATE, + 2, + MR_Q_UPDATE, "c", CLUSTERS_TABLE, "clusters SET name = '%s', description = NVL('%s', CHR(0)), location = NVL('%s', CHR(0))", @@ -3108,7 +5724,8 @@ struct query Queries2[] = { /* Q_DCLU - DELETE_CLUSTER */ "delete_cluster", "dclu", - DELETE, + 2, + MR_Q_DELETE, "c", CLUSTERS_TABLE, NULL, @@ -3124,7 +5741,8 @@ struct query Queries2[] = { /* Q_GMCM - GET_MACHINE_TO_CLUSTER_MAP */ "get_machine_to_cluster_map", "gmcm", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "mcm", MCMAP_TABLE, "m.name, c.name FROM machine m, clusters c, mcmap mcm", @@ -3140,7 +5758,8 @@ struct query Queries2[] = { /* Q_AMTC - ADD_MACHINE_TO_CLUSTER */ "add_machine_to_cluster", "amtc", - APPEND, + 2, + MR_Q_APPEND, "mcm", MCMAP_TABLE, "INTO mcmap (mach_id, clu_id) VALUES (%d, %d)", @@ -3156,7 +5775,8 @@ struct query Queries2[] = { /* Q_DMFC - DELETE_MACHINE_FROM_CLUSTER */ "delete_machine_from_cluster", "dmfc", - DELETE, + 2, + MR_Q_DELETE, "mcm", MCMAP_TABLE, 0, @@ -3172,7 +5792,8 @@ struct query Queries2[] = { /* Q_GCLD - GET_CLUSTER_DATA */ "get_cluster_data", "gcld", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "svc", SVC_TABLE, "c.name, svc.serv_label, svc.serv_cluster FROM svc svc, clusters c", @@ -3188,7 +5809,8 @@ struct query Queries2[] = { /* Q_ACLD - ADD_CLUSTER_DATA */ "add_cluster_data", "acld", - APPEND, + 2, + MR_Q_APPEND, "svc", SVC_TABLE, "INTO svc (clu_id, serv_label, serv_cluster) VALUES (%d, '%s', '%s')", @@ -3204,7 +5826,8 @@ struct query Queries2[] = { /* Q_DCLD - DELETE_CLUSTER_DATA */ "delete_cluster_data", "dcld", - DELETE, + 2, + MR_Q_DELETE, "svc", SVC_TABLE, NULL, @@ -3217,18 +5840,70 @@ struct query Queries2[] = { }, { - /* Q_GLIN - GET_LIST_INFO */ + /* Q_GLIN - GET_LIST_INFO, v2 */ "get_list_info", "glin", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "l", LIST_TABLE, - "name, active, publicflg, hidden, maillist, group, gid, ace_type, ace_name, description, modtime, modby, modwith FROM list", - glin_fields, + "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", + "name", + &glin_validate, + }, + + { + /* Q_GLIN - GET_LIST_INFO, v3 */ + "get_list_info", + "glin", + 3, + MR_Q_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, + MR_Q_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", + glin4_fields, + 16, + "name LIKE '%s'", + 1, + "name", + &glin_validate, + }, + + { + /* Q_GLIN - GET_LIST_INFO, v10 */ + "get_list_info", + "glin", + 10, + MR_Q_RETRIEVE, + "l", + LIST_TABLE, + "l.name, l.active, l.publicflg, l.hidden, l.maillist, l.grouplist, l.gid, l.nfsgroup, l.mailman, m.name, l.acl_type, l.acl_id, l.memacl_type, l.memacl_id, l.description, TO_CHAR(l.modtime, 'DD-mon-YYYY HH24:MI:SS'), l.modby, l.modwith FROM list l, machine m", + glin_fields, + 18, + "l.name LIKE '%s' AND m.mach_id = l.mailman_id", + 1, + "l.name", &glin_validate, }, @@ -3236,7 +5911,8 @@ struct query Queries2[] = { /* Q_EXLN - EXPAND_LIST_NAMES */ "expand_list_names", "exln", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "l", LIST_TABLE, "name FROM list", @@ -3249,15 +5925,67 @@ struct query Queries2[] = { }, { - /* Q_ALIS - ADD_LIST */ /* uses prefetch_value() for list_id */ + /* Q_ALIS - ADD_LIST, v2 */ /* uses prefetch_value() for list_id */ "add_list", "alis", - APPEND, + 2, + MR_Q_APPEND, "l", LIST_TABLE, "INTO list (name, active, publicflg, hidden, maillist, grouplist, gid, acl_type, acl_id, description, list_id) VALUES ('%s', %s, %s, %s, %s, %s, %s, '%s', %d, NVL('%s', CHR(0)), %s)", - alis_fields, + alis2_fields, + 10, + 0, + 0, + NULL, + &alis2_validate, + }, + + { + /* Q_ALIS - ADD_LIST, v3 */ /* uses prefetch_value() for list_id */ + "add_list", + "alis", + 3, + MR_Q_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, + MR_Q_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)", + alis4_fields, + 13, + 0, + 0, + NULL, + &alis4_validate, + }, + + { + /* Q_ALIS - ADD_LIST, v10 */ /* uses prefetch_value() for list_id */ + "add_list", + "alis", 10, + MR_Q_APPEND, + "l", + LIST_TABLE, + "INTO list (name, active, publicflg, hidden, maillist, grouplist, gid, nfsgroup, mailman, mailman_id, acl_type, acl_id, memacl_type, memacl_id, description, list_id) VALUES ('%s', %s, %s, %s, %s, %s, %s, %s, %s, %d, '%s', %d, '%s', %d, NVL('%s', CHR(0)), %s)", + alis_fields, + 15, 0, 0, NULL, @@ -3265,15 +5993,67 @@ struct query Queries2[] = { }, { - /* Q_ULIS - UPDATE_LIST */ + /* Q_ULIS - UPDATE_LIST, v2 */ "update_list", "ulis", - UPDATE, + 2, + MR_Q_UPDATE, "l", LIST_TABLE, "list SET name = '%s', active = %s, publicflg = %s, hidden = %s, maillist = %s, grouplist = %s, gid = %s, acl_type = '%s', acl_id = %d, description = NVL('%s', CHR(0))", - ulis_fields, + ulis2_fields, + 10, + "list_id = %d", + 1, + NULL, + &ulis2_validate, + }, + + { + /* Q_ULIS - UPDATE_LIST, v3 */ + "update_list", + "ulis", + 3, + MR_Q_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, + MR_Q_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))", + ulis4_fields, + 13, + "list_id = %d", + 1, + NULL, + &ulis4_validate, + }, + + { + /* Q_ULIS, UPDATE_LIST, v10 */ + "update_list", + "ulis", 10, + MR_Q_UPDATE, + "l", + LIST_TABLE, + "list SET name = '%s', active = %s, publicflg = %s, hidden = %s, maillist = %s, grouplist = %s, gid = %s, nfsgroup = %s, mailman = %s, mailman_id = %d, acl_type = '%s', acl_id = %d, memacl_type = '%s', memacl_id = %d, description = NVL('%s', CHR(0))", + ulis_fields, + 15, "list_id = %d", 1, NULL, @@ -3284,7 +6064,8 @@ struct query Queries2[] = { /* Q_DLIS - DELETE_LIST */ "delete_list", "dlis", - DELETE, + 2, + MR_Q_DELETE, "l", LIST_TABLE, NULL, @@ -3300,7 +6081,8 @@ struct query Queries2[] = { /* Q_AMTL - ADD_MEMBER_TO_LIST */ "add_member_to_list", "amtl", - APPEND, + 2, + MR_Q_APPEND, 0, IMEMBERS_TABLE, 0, @@ -3312,11 +6094,46 @@ struct query Queries2[] = { &amtl_validate, }, + { + /* Q_ATML - ADD_TAGGED_MEMBER_TO_LIST */ + "add_tagged_member_to_list", + "atml", + 2, + MR_Q_APPEND, + 0, + IMEMBERS_TABLE, + 0, + atml_fields, + 4, + NULL, + 0, + NULL, + &atml_validate, + }, + + { + /* Q_TMOL - TAG_MEMBER_OF_LIST */ + "tag_member_of_list", + "tmol", + 2, + MR_Q_UPDATE, + 0, + IMEMBERS_TABLE, + 0, + atml_fields, + 1, + 0, + 3, + NULL, + &tmol_validate, + }, + { /* Q_DMFL - DELETE_MEMBER_FROM_LIST */ "delete_member_from_list", "dmfl", - DELETE, + 2, + MR_Q_DELETE, 0, IMEMBERS_TABLE, NULL, @@ -3332,7 +6149,8 @@ struct query Queries2[] = { /* Q_GAUS - GET_ACE_USE */ "get_ace_use", "gaus", - RETRIEVE, + 2, + MR_Q_RETRIEVE, 0, 0, 0, @@ -3344,11 +6162,29 @@ struct query Queries2[] = { &gaus_validate, }, + { + /* Q_GHBO - GET_HOST_BY_OWNER */ + "get_host_by_owner", + "ghbo", + 2, + MR_Q_RETRIEVE, + 0, + 0, + 0, + ghbo_fields, + 1, + 0, + 2, + NULL, + &ghbo_validate, + }, + { /* Q_QGLI - QUALIFIED_GET_LISTS */ "qualified_get_lists", "qgli", - RETRIEVE, + 2, + MR_Q_RETRIEVE, 0, LIST_TABLE, 0, @@ -3364,7 +6200,8 @@ struct query Queries2[] = { /* Q_GMOL - GET_MEMBERS_OF_LIST */ "get_members_of_list", "gmol", - RETRIEVE, + 2, + MR_Q_RETRIEVE, NULL, IMEMBERS_TABLE, NULL, @@ -3380,7 +6217,8 @@ struct query Queries2[] = { /* Q_GEML - GET_END_MEMBERS_OF_LIST */ "get_end_members_of_list", "geml", - RETRIEVE, + 2, + MR_Q_RETRIEVE, NULL, IMEMBERS_TABLE, NULL, @@ -3389,14 +6227,32 @@ struct query Queries2[] = { NULL, 1, NULL, - &geml_validate, + &gmol_validate, + }, + + { + /* Q_GTML - GET_TAGGED_MEMBERS_OF_LIST */ + "get_tagged_members_of_list", + "gtml", + 2, + MR_Q_RETRIEVE, + NULL, + IMEMBERS_TABLE, + NULL, + gtml_fields, + 3, + NULL, + 1, + NULL, + &gmol_validate, }, { /* Q_GLOM - GET_LISTS_OF_MEMBER */ "get_lists_of_member", "glom", - RETRIEVE, + 2, + MR_Q_RETRIEVE, 0, IMEMBERS_TABLE, 0, @@ -3412,7 +6268,8 @@ struct query Queries2[] = { /* Q_CMOL - COUNT_MEMBERS_OF_LIST */ "count_members_of_list", "cmol", - RETRIEVE, + 2, + MR_Q_RETRIEVE, 0, IMEMBERS_TABLE, 0, @@ -3428,7 +6285,8 @@ struct query Queries2[] = { /* Q_GSIN - GET_SERVER_INFO */ "get_server_info", "gsin", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "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", @@ -3444,7 +6302,8 @@ struct query Queries2[] = { /* Q_QGSV - QUALIFIED_GET_SERVER */ "qualified_get_server", "qgsv", - RETRIEVE, + 2, + MR_Q_RETRIEVE, 0, SERVERS_TABLE, 0, @@ -3460,7 +6319,8 @@ struct query Queries2[] = { /* Q_ASIN - ADD_SERVER_INFO */ "add_server_info", "asin", - APPEND, + 2, + MR_Q_APPEND, "s", 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)", @@ -3476,7 +6336,8 @@ struct query Queries2[] = { /* Q_USIN - UPDATE_SERVER_INFO */ "update_server_info", "usin", - UPDATE, + 2, + MR_Q_UPDATE, "s", SERVERS_TABLE, "servers SET update_int = %s, target_file = '%s', script = '%s', type = '%s', enable = %s, acl_type = '%s', acl_id = %d", @@ -3492,7 +6353,8 @@ struct query Queries2[] = { /* Q_RSVE - RESET_SERVER_ERROR */ "reset_server_error", "rsve", - UPDATE, + 2, + MR_Q_UPDATE, "s", SERVERS_TABLE, "servers SET harderror = 0, dfcheck = dfgen", @@ -3508,7 +6370,8 @@ struct query Queries2[] = { /* Q_SSIF - SET_SERVER_INTERNAL_FLAGS */ "set_server_internal_flags", "ssif", - UPDATE, + 2, + MR_Q_UPDATE, "s", SERVERS_TABLE, "servers SET dfgen = %s, dfcheck = %s, inprogress = %s, harderror = %s, errmsg = NVL('%s', CHR(0))", @@ -3524,7 +6387,8 @@ struct query Queries2[] = { /* Q_DSIN - DELETE_SERVER_INFO */ "delete_server_info", "dsin", - DELETE, + 2, + MR_Q_DELETE, "s", SERVERS_TABLE, NULL, @@ -3540,7 +6404,8 @@ struct query Queries2[] = { /* Q_GSHI - GET_SERVER_HOST_INFO */ "get_server_host_info", "gshi", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "sh", 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", @@ -3556,7 +6421,8 @@ struct query Queries2[] = { /* Q_QGSH - QUALIFIED_GET_SERVER_HOST */ "qualified_get_server_host", "qgsh", - RETRIEVE, + 2, + MR_Q_RETRIEVE, 0, SERVERHOSTS_TABLE, 0, @@ -3572,7 +6438,8 @@ struct query Queries2[] = { /* Q_ASHI - ADD_SERVER_HOST_INFO */ "add_server_host_info", "ashi", - APPEND, + 2, + MR_Q_APPEND, "sh", SERVERHOSTS_TABLE, "INTO serverhosts (service, mach_id, enable, value1, value2, value3) VALUES (UPPER('%s'), %d, %s, %s, %s, NVL('%s', CHR(0)))", @@ -3588,7 +6455,8 @@ struct query Queries2[] = { /* Q_USHI - UPDATE_SERVER_HOST_INFO */ "update_server_host_info", "ushi", - UPDATE, + 2, + MR_Q_UPDATE, "sh", SERVERHOSTS_TABLE, "serverhosts SET enable = %s, value1 = %s, value2 = %s, value3 = NVL('%s', CHR(0))", @@ -3604,7 +6472,8 @@ struct query Queries2[] = { /* Q_RSHE - RESET_SERVER_HOST_ERROR */ "reset_server_host_error", "rshe", - UPDATE, + 2, + MR_Q_UPDATE, "sh", SERVERHOSTS_TABLE, "serverhosts SET hosterror = 0", @@ -3620,7 +6489,8 @@ struct query Queries2[] = { /* Q_SSHO - SET_SERVER_HOST_OVERRIDE */ "set_server_host_override", "ssho", - UPDATE, + 2, + MR_Q_UPDATE, "sh", SERVERHOSTS_TABLE, "serverhosts SET override = 1", @@ -3636,7 +6506,8 @@ struct query Queries2[] = { /* Q_SSHI - SET_SERVER_HOST_INTERNAL */ "set_server_host_internal", "sshi", - UPDATE, + 2, + MR_Q_UPDATE, "s", SERVERHOSTS_TABLE, "serverhosts SET override = %s, success = %s, inprogress = %s, hosterror = %s, hosterrmsg = NVL('%s', CHR(0)), ltt = %s, lts = %s", @@ -3652,7 +6523,8 @@ struct query Queries2[] = { /* Q_DSHI - DELETE_SERVER_HOST_INFO */ "delete_server_host_info", "dshi", - DELETE, + 2, + MR_Q_DELETE, "sh", SERVERHOSTS_TABLE, NULL, @@ -3668,7 +6540,8 @@ struct query Queries2[] = { /* Q_GSLO - GET_SERVER_LOCATIONS */ "get_server_locations", "gslo", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "sh", SERVERHOSTS_TABLE, "sh.service, m.name FROM serverhosts sh, machine m", @@ -3684,7 +6557,8 @@ struct query Queries2[] = { /* Q_GFSL - GET_FILESYS_BY_LABEL */ "get_filesys_by_label", "gfsl", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "fs", FILESYS_TABLE, "fs.label, fs.type, m.name, fs.name, fs.mount, fs.rwaccess, fs.comments, u.login, l.name, fs.createflg, fs.lockertype, TO_CHAR(fs.modtime, 'DD-mon-YYYY HH24:MI:SS'), fs.modby, fs.modwith FROM filesys fs, machine m, users u, list l", @@ -3693,14 +6567,15 @@ struct query Queries2[] = { "fs.label LIKE '%s' AND fs.mach_id = m.mach_id AND fs.owner = u.users_id AND fs.owners = l.list_id", 1, "fs.label", - &VDfix_modby, + &gfsl_validate, }, { /* Q_GFSM - GET_FILESYS_BY_MACHINE */ "get_filesys_by_machine", "gfsm", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "fs", FILESYS_TABLE, "fs.label, fs.type, m.name, fs.name, fs.mount, fs.rwaccess, fs.comments, u.login, l.name, fs.createflg, fs.lockertype, TO_CHAR(fs.modtime, 'DD-mon-YYYY HH24:MI:SS'), fs.modby, fs.modwith FROM filesys fs, machine m, users u, list l", @@ -3716,13 +6591,14 @@ struct query Queries2[] = { /* Q_GFSN - GET_FILESYS_BY_NFSPHYS */ "get_filesys_by_nfsphys", "gfsn", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "fs", FILESYS_TABLE, "fs.label, fs.type, m.name, fs.name, fs.mount, fs.rwaccess, fs.comments, u.login, l.name, fs.createflg, fs.lockertype, TO_CHAR(fs.modtime, 'DD-mon-YYYY HH24:MI:SS'), fs.modby, fs.modwith FROM filesys fs, machine m, users u, list l, 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' 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, @@ -3732,7 +6608,8 @@ struct query Queries2[] = { /* Q_GFSG - GET_FILESYS_BY_GROUP */ "get_filesys_by_group", "gfsg", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "fs", FILESYS_TABLE, "fs.label, fs.type, m.name, fs.name, fs.mount, fs.rwaccess, fs.comments, u.login, l.name, fs.createflg, fs.lockertype, TO_CHAR(fs.modtime, 'DD-mon-YYYY HH24:MI:SS'), fs.modby, fs.modwith FROM filesys fs, machine m, users u, list l", @@ -3748,7 +6625,8 @@ struct query Queries2[] = { /* Q_GFSP - GET_FILESYS_BY_PATH */ "get_filesys_by_path", "gfsp", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "fs", FILESYS_TABLE, "fs.label, fs.type, m.name, fs.name, fs.mount, fs.rwaccess, fs.comments, u.login, l.name, fs.createflg, fs.lockertype, TO_CHAR(fs.modtime, 'DD-mon-YYYY HH24:MI:SS'), fs.modby, fs.modwith FROM filesys fs, machine m, users u, list l", @@ -3764,10 +6642,11 @@ struct query Queries2[] = { /* Q_AFIL - ADD_FILESYS */ /* uses prefetch_value() for filsys_id */ "add_filesys", "afil", - APPEND, + 2, + MR_Q_APPEND, "fs", FILESYS_TABLE, - "INTO filesys (label, type, mach_id, name, mount, rwaccess, comments, owner, owners, createflg, lockertype, filsys_id) VALUES ('%s', '%s', %d, NVL('%s', CHR(0)), '%s', '%s', NVL('%s', CHR(0)), %d, %d, %s, '%s', %s)", + "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, @@ -3780,10 +6659,11 @@ struct query Queries2[] = { /* Q_UFIL - UPDATE_FILESYS */ "update_filesys", "ufil", - UPDATE, + 2, + MR_Q_UPDATE, "fs", FILESYS_TABLE, - "filesys SET label = '%s', type = '%s', mach_id = %d, name = NVL('%s', CHR(0)), mount = '%s', rwaccess = '%s', comments = NVL('%s', CHR(0)), owner = %d, owners = %d, createflg = %s, lockertype = '%s'", + "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", @@ -3796,7 +6676,8 @@ struct query Queries2[] = { /* Q_DFIL - DELETE_FILESYS */ "delete_filesys", "dfil", - DELETE, + 2, + MR_Q_DELETE, "fs", FILESYS_TABLE, NULL, @@ -3812,7 +6693,8 @@ struct query Queries2[] = { /* Q_GFGM - GET_FSGROUP_MEMBERS */ "get_fsgroup_members", "gfgm", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "fg", FSGROUP_TABLE, "fs.label, fg.key FROM fsgroup fg, filesys fs", @@ -3828,7 +6710,8 @@ struct query Queries2[] = { /* Q_AFTG - ADD_FILESYS_TO_FSGROUP */ "add_filesys_to_fsgroup", "aftg", - APPEND, + 2, + MR_Q_APPEND, "fg", FSGROUP_TABLE, "INTO fsgroup (group_id, filsys_id, key) VALUES (%d, %d, '%s')", @@ -3844,7 +6727,8 @@ struct query Queries2[] = { /* Q_RFFG - REMOVE_FILESYS_FROM_FSGROUP */ "remove_filesys_from_fsgroup", "rffg", - DELETE, + 2, + MR_Q_DELETE, "fg", FSGROUP_TABLE, NULL, @@ -3860,7 +6744,8 @@ struct query Queries2[] = { /* Q_GANF - GET_ALL_NFSPHYS */ "get_all_nfsphys", "ganf", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "np", 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", @@ -3876,7 +6761,8 @@ struct query Queries2[] = { /* Q_GNFP - GET_NFSPHYS */ "get_nfsphys", "gnfp", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "np", 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", @@ -3892,7 +6778,8 @@ struct query Queries2[] = { /* Q_ANFP - ADD_NFSPHYS */ /* uses prefetch_value() for nfsphys_id */ "add_nfsphys", "anfp", - APPEND, + 2, + MR_Q_APPEND, "np", NFSPHYS_TABLE, "INTO nfsphys (mach_id, dir, device, status, allocated, partsize, nfsphys_id) VALUES (%d, '%s', NVL('%s', CHR(0)), %s, %s, %s, %s)", @@ -3908,7 +6795,8 @@ struct query Queries2[] = { /* Q_UNFP - UPDATE_NFSPHYS */ "update_nfsphys", "unfp", - UPDATE, + 2, + MR_Q_UPDATE, "np", NFSPHYS_TABLE, "nfsphys SET device = NVL('%s', CHR(0)), status = %s, allocated = %s, partsize = %s", @@ -3924,7 +6812,8 @@ struct query Queries2[] = { /* Q_AJNF - ADJUST_NFSPHYS_ALLOCATION */ "adjust_nfsphys_allocation", "ajnf", - UPDATE, + 2, + MR_Q_UPDATE, "np", NFSPHYS_TABLE, "nfsphys SET allocated = allocated + %s", @@ -3940,7 +6829,8 @@ struct query Queries2[] = { /* Q_DNFP - DELETE_NFSPHYS */ "delete_nfsphys", "dnfp", - DELETE, + 2, + MR_Q_DELETE, "np", NFSPHYS_TABLE, NULL, @@ -3956,7 +6846,8 @@ struct query Queries2[] = { /* Q_GQOT - GET_QUOTA */ "get_quota", "gqot", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "q", QUOTA_TABLE, "fs.label, q.type, q.entity_id, q.quota, q.phys_id, m.name, TO_CHAR(q.modtime, 'DD-mon-YYYY HH24:MI:SS'), q.modby, q.modwith FROM quota q, filesys fs, machine m", @@ -3972,7 +6863,8 @@ struct query Queries2[] = { /* Q_GQBF - GET_QUOTA_BY_FILESYS */ "get_quota_by_filesys", "gqbf", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "q", QUOTA_TABLE, "fs.label, q.type, q.entity_id, q.quota, q.phys_id, m.name, TO_CHAR(q.modtime, 'DD-mon-YYYY HH24:MI:SS'), q.modby, q.modwith FROM quota q, filesys fs, machine m", @@ -3988,7 +6880,8 @@ struct query Queries2[] = { /* Q_AQOT - ADD_QUOTA */ /* prefetch_filsys() gets last 1 value */ "add_quota", "aqot", - APPEND, + 2, + MR_Q_APPEND, 0, QUOTA_TABLE, "INTO quota (filsys_id, type, entity_id, quota, phys_id) VALUES ('%s', %d, %d, %s, %s)", @@ -4004,7 +6897,8 @@ struct query Queries2[] = { /* Q_UQOT - UPDATE_QUOTA */ "update_quota", "uqot", - UPDATE, + 2, + MR_Q_UPDATE, 0, QUOTA_TABLE, "quota SET quota = %s", @@ -4020,7 +6914,8 @@ struct query Queries2[] = { /* Q_DQOT - DELETE_QUOTA */ "delete_quota", "dqot", - DELETE, + 2, + MR_Q_DELETE, 0, QUOTA_TABLE, NULL, @@ -4036,7 +6931,8 @@ struct query Queries2[] = { /* Q_GNFQ - GET_NFS_QUOTAS */ "get_nfs_quota", "gnfq", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "q", QUOTA_TABLE, "fs.label, u.login, q.quota, q.phys_id, m.name, TO_CHAR(q.modtime, 'DD-mon-YYYY HH24:MI:SS'), q.modby, q.modwith FROM quota q, filesys fs, users u, machine m", @@ -4052,7 +6948,8 @@ struct query Queries2[] = { /* Q_GNQP - GET_NFS_QUOTAS_BY_PARTITION */ "get_nfs_quotas_by_partition", "gnqp", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "q", QUOTA_TABLE, "fs.label, u.login, q.quota, np.dir, m.name FROM quota q, filesys fs, users u, nfsphys np, machine m", @@ -4068,7 +6965,8 @@ struct query Queries2[] = { /* Q_ANFQ - ADD_NFS_QUOTA */ /* prefetch_filsys() gets last 1 value */ "add_nfs_quota", "anfq", - APPEND, + 2, + MR_Q_APPEND, 0, QUOTA_TABLE, "INTO quota (type, filsys_id, entity_id, quota, phys_id ) VALUES ('USER', %d, %d, %s, %s)", @@ -4084,7 +6982,8 @@ struct query Queries2[] = { /* Q_UNFQ - UPDATE_NFS_QUOTA */ "update_nfs_quota", "unfq", - UPDATE, + 2, + MR_Q_UPDATE, 0, QUOTA_TABLE, "quota SET quota = %s", @@ -4100,7 +6999,8 @@ struct query Queries2[] = { /* Q_DNFQ - DELETE_NFS_QUOTA */ "delete_nfs_quota", "dnfq", - DELETE, + 2, + MR_Q_DELETE, 0, QUOTA_TABLE, NULL, @@ -4113,14 +7013,15 @@ struct query Queries2[] = { }, { - /* Q_GZCL - GET_ZEPHYR_CLASS */ + /* Q_GZCL - GET_ZEPHYR_CLASS, v2 */ "get_zephyr_class", "gzcl", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "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", - gzcl_fields, + gzcl2_fields, 12, "class LIKE '%s'", 1, @@ -4129,34 +7030,87 @@ struct query Queries2[] = { }, { - /* Q_AZCL - ADD_ZEPHYR_CLASS */ + /* Q_GZCL - GET_ZEPHYR_CLASS, v5 */ + "get_zephyr_class", + "gzcl", + 5, + MR_Q_RETRIEVE, + "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, + "class", + &gzcl_validate, + }, + + { + /* Q_AZCL - ADD_ZEPHYR_CLASS, v2 */ "add_zephyr_class", "azcl", - APPEND, + 2, + MR_Q_APPEND, "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)", - azcl_fields, + azcl2_fields, 9, 0, 0, NULL, + &azcl2_validate, + }, + + { + /* Q_AZCL - ADD_ZEPHYR_CLASS, v5 */ + "add_zephyr_class", + "azcl", + 5, + MR_Q_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_UZCL - UPDATE_ZEPHYR_CLASS */ + /* Q_UZCL - UPDATE_ZEPHYR_CLASS, v2 */ "update_zephyr_class", "uzcl", - UPDATE, + 2, + MR_Q_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", - uzcl_fields, + uzcl2_fields, 9, "class = '%s'", 1, NULL, + &uzcl2_validate, + }, + + { + /* Q_UZCL - UPDATE_ZEPHYR_CLASS, v5 */ + "update_zephyr_class", + "uzcl", + 5, + MR_Q_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, }, @@ -4164,7 +7118,8 @@ struct query Queries2[] = { /* Q_DZCL - DELETE_ZEPHYR_CLASS */ "delete_zephyr_class", "dzcl", - DELETE, + 2, + MR_Q_DELETE, "z", ZEPHYR_TABLE, 0, @@ -4180,7 +7135,8 @@ struct query Queries2[] = { /* Q_GSHA - GET_SERVER_HOST_ACCESS */ "get_server_host_access", "gsha", - RETRIEVE, + 2, + MR_Q_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", @@ -4196,7 +7152,8 @@ struct query Queries2[] = { /* Q_ASHA - ADD_SERVER_HOST_ACCESS */ "add_server_host_access", "asha", - APPEND, + 2, + MR_Q_APPEND, "ha", HOSTACCESS_TABLE, "INTO hostaccess (mach_id, acl_type, acl_id) VALUES (%d, '%s', %d)", @@ -4212,46 +7169,100 @@ struct query Queries2[] = { /* Q_USHA - UPDATE_SERVER_HOST_ACCESS */ "update_server_host_access", "usha", - UPDATE, + 2, + MR_Q_UPDATE, "ha", HOSTACCESS_TABLE, "hostaccess SET acl_type = '%s', acl_id = %d", asha_fields, 2, - "mach_id = %d", - 1, + "mach_id = %d", + 1, + NULL, + &asha_validate, + }, + + { + /* Q_DSHA - DELETE_SERVER_HOST_ACCESS */ + "delete_server_host_access", + "dsha", + 2, + MR_Q_DELETE, + "ha", + HOSTACCESS_TABLE, + 0, + asha_fields, + 0, + "mach_id = %d", + 1, + NULL, + &VDmach, + }, + + { + /* Q_GACL - GET_ACL */ + "get_acl", + "gacl", + 2, + MR_Q_RETRIEVE, + "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_AACL - ADD_ACL */ + "add_acl", + "aacl", + 2, + MR_Q_APPEND, + "ac", + ACL_TABLE, + "INTO acl (mach_id, target, kind, list_id) VALUES (%d, '%s', '%s', %d)", + aacl_fields, + 4, + 0, + 0, NULL, - &asha_validate, + &aacl_validate, }, { - /* Q_DSHA - DELETE_SERVER_HOST_ACCESS */ - "delete_server_host_access", - "dsha", - DELETE, - "ha", - HOSTACCESS_TABLE, + /* Q_DACL - DELETE_ACL */ + "delete_acl", + "dacl", + 2, + MR_Q_DELETE, + "ac", + ACL_TABLE, 0, - asha_fields, + dacl_fields, 0, - "mach_id = %d", - 1, + "mach_id = %d AND target = '%s'", + 2, NULL, - &VDmach, + &gacl_validate, }, { /* Q_GSVC - GET_SERVICE */ "get_service", "gsvc", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "ss", SERVICES_TABLE, "name, protocol, port, description, TO_CHAR(modtime, 'DD-mon-YYYY HH24:MI:SS'), modby, modwith FROM services", gsvc_fields, 7, - "name LIKE '%s'", - 1, + "name LIKE '%s' AND protocol LIKE '%s'", + 2, "name", &VDfix_modby, }, @@ -4260,7 +7271,8 @@ struct query Queries2[] = { /* Q_ASVC - ADD_SERVICE */ "add_service", "asvc", - APPEND, + 2, + MR_Q_APPEND, "ss", SERVICES_TABLE, "INTO services (name, protocol, port, description) VALUES ('%s', '%s', %s, NVL('%s', CHR(0)))", @@ -4276,151 +7288,263 @@ struct query Queries2[] = { /* Q_DSVC - DELETE_SERVICE */ "delete_service", "dsvc", - DELETE, + 2, + MR_Q_DELETE, "ss", SERVICES_TABLE, 0, - asvc_fields, + dsvc_fields, 0, - "name = '%s'", - 1, + "name = '%s' AND protocol = '%s'", + 2, NULL, - &asvc_validate, + &dsvc_validate, }, { - /* Q_GPCE - GET_PRINTCAP_ENTRY */ - "get_printcap_entry", - "gpce", - RETRIEVE, - "pc", - PRINTCAP_TABLE, - "pc.name, m.name, pc.dir, pc.rp, pc.quotaserver, pc.auth, pc.price, pc.comments, TO_CHAR(pc.modtime, 'DD-mon-YYYY HH24:MI:SS'), pc.modby, pc.modwith FROM printcap pc, machine m", - gpce_fields, - 11, - "pc.name LIKE '%s' AND m.mach_id = pc.mach_id", + /* Q_GPRN - GET_PRINTER */ + "get_printer", + "gprn", + 2, + MR_Q_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, - "pc.name", - &gpce_validate, + "pr.name", + &VDfix_modby, }, { - /* Q_APCE - ADD_PRINTCAP_ENTRY */ - "add_printcap_entry", - "apce", - APPEND, - "pc", - PRINTCAP_TABLE, - "INTO printcap (name, mach_id, dir, rp, quotaserver, auth, price, comments) VALUES ('%s', %d, '%s', '%s', %d, %s, %s, NVL('%s', CHR(0)))", - apce_fields, - 8, - 0, - 0, - NULL, - &apce_validate, + /* Q_GPBD - GET_PRINTER_BY_DUPLEXNAME */ + "get_printer_by_duplexname", + "gpbd", + 2, + MR_Q_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, + "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, + "pr.name", + &VDfix_modby, }, { - /* Q_DPCE - DELETE_PRINTCAP_ENTRY */ - "delete_printcap_entry", - "dpce", - DELETE, - "pc", - PRINTCAP_TABLE, - 0, - apce_fields, - 0, - "name = '%s'", + /* Q_GPBE - GET_PRINTER_BY_ETHERNET */ + "get_printer_by_ethernet", + "gpbe", + 2, + MR_Q_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, - NULL, - &dpce_validate, + "pr.name", + &VDfix_modby, }, { - /* Q_GPCP - GET_PRINTCAP */ - "get_printcap", - "gpcp", - RETRIEVE, - "pc", - PRINTCAP_TABLE, - "pc.name, m.name, pc.dir, pc.rp, pc.comments, TO_CHAR(pc.modtime, 'DD-mon-YYYY HH24:MI:SS'), pc.modby, pc.modwith FROM printcap pc, machine m", - gpcp_fields, - 8, - "pc.name LIKE '%s' AND m.mach_id = pc.mach_id", + /* Q_GPBH - GET_PRINTER_BY_HOSTNAME */ + "get_printer_by_hostname", + "gpbh", + 2, + MR_Q_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, + "pr.name", + &VDfix_modby, + }, + + { + /* Q_GPBR - GET_PRINTER_BY_RM */ + "get_printer_by_rm", + "gpbr", + 2, + MR_Q_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", + 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, + MR_Q_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, + MR_Q_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, - "pc.name", + "pr.name", &VDfix_modby, }, { - /* Q_DPCP - DELETE_PRINTCAP */ - "delete_printcap", - "dpcp", - DELETE, - "pc", - PRINTCAP_TABLE, + /* Q_APRN - ADD_PRINTER */ + "add_printer", + "aprn", + 2, + MR_Q_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, + MR_Q_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_DPRN - DELETE_PRINTER */ + "delete_printer", + "dprn", + 2, + MR_Q_DELETE, + "pr", + PRINTERS_TABLE, 0, - apce_fields, + aprn_fields, 0, "name = '%s'", 1, NULL, - &dpce_validate, + &dprn_validate, }, { - /* Q_GPDM - GET_PALLADIUM */ - "get_palladium", - "gpdm", - RETRIEVE, - "pal", - PALLADIUM_TABLE, - "pal.name, pal.identifier, m.name, TO_CHAR(pal.modtime, 'DD-mon-YYYY HH24:MI:SS'), pal.modby, pal.modwith FROM palladium pal, machine m", - gpdm_fields, - 6, - "pal.name LIKE '%s' AND m.mach_id = pal.mach_id", + /* Q_GPSV - GET_PRINT_SERVER */ + "get_print_server", + "gpsv", + 2, + MR_Q_RETRIEVE, + "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, - "pal.name", - &VDfix_modby, + NULL, + &gpsv_validate, }, { - /* Q_APDM - ADD_PALLADIUM */ - "add_palladium", - "apdm", - APPEND, - "pal", - PALLADIUM_TABLE, - "INTO palladium (name, identifier, mach_id) VALUES ('%s', %s, %d)", - apdm_fields, - 3, + /* Q_APSV - ADD_PRINT_SERVER */ + "add_print_server", + "apsv", + 2, + MR_Q_APPEND, + "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, NULL, - &apdm_validate, + &apsv_validate, + }, + + { + /* Q_UPSV - UPDATE_PRINT_SERVER */ + "update_print_server", + "upsv", + 2, + MR_Q_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", - DELETE, - "pal", - PALLADIUM_TABLE, + /* Q_DPSV - DELETE_PRINT_SERVER */ + "delete_print_server", + "dpsv", + 2, + MR_Q_DELETE, + "ps", + PRINTSERVERS_TABLE, 0, - apdm_fields, + dpsv_fields, 0, - "name = '%s'", + "mach_id = %d", 1, NULL, - &dpdm_validate, + &dpsv_validate, }, { /* Q_GALI - GET_ALIAS */ "get_alias", "gali", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "a", ALIAS_TABLE, "name, type, trans FROM alias", @@ -4436,7 +7560,8 @@ struct query Queries2[] = { /* Q_AALI - ADD_ALIAS */ "add_alias", "aali", - APPEND, + 2, + MR_Q_APPEND, "a", ALIAS_TABLE, "INTO alias (name, type, trans) VALUES ('%s', '%s', '%s')", @@ -4452,7 +7577,8 @@ struct query Queries2[] = { /* Q_DALI - DELETE_ALIAS */ "delete_alias", "dali", - DELETE, + 2, + MR_Q_DELETE, "a", ALIAS_TABLE, NULL, @@ -4468,7 +7594,8 @@ struct query Queries2[] = { /* Q_GVAL - GET_VALUE */ "get_value", "gval", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "val", NUMVALUES_TABLE, "value FROM numvalues", @@ -4484,7 +7611,8 @@ struct query Queries2[] = { /* Q_AVAL - ADD_VALUE */ "add_value", "aval", - APPEND, + 2, + MR_Q_APPEND, "val", NUMVALUES_TABLE, "INTO numvalues (name, value) VALUES ('%s', %s)", @@ -4500,7 +7628,8 @@ struct query Queries2[] = { /* Q_UVAL - UPDATE_VALUE */ "update_value", "uval", - UPDATE, + 2, + MR_Q_UPDATE, "val", NUMVALUES_TABLE, "numvalues SET value = %s", @@ -4516,7 +7645,8 @@ struct query Queries2[] = { /* Q_DVAL - DELETE_VALUE */ "delete_value", "dval", - DELETE, + 2, + MR_Q_DELETE, "val", NUMVALUES_TABLE, NULL, @@ -4532,7 +7662,8 @@ struct query Queries2[] = { /* Q_GATS - GET_ALL_TABLE_STATS */ "get_all_table_stats", "gats", - RETRIEVE, + 2, + MR_Q_RETRIEVE, "tbs", TBLSTATS_TABLE, "table_name, appends, updates, deletes, TO_CHAR(modtime, 'DD-mon-YYYY HH24:MI:SS') FROM tblstats", @@ -4548,7 +7679,8 @@ struct query Queries2[] = { /* Q__SDL - _SET_DEBUG_LEVEL */ "_set_debug_level", "_sdl", - UPDATE, + 2, + MR_Q_UPDATE, NULL, 0, NULL, @@ -4560,6 +7692,278 @@ struct query Queries2[] = { &_sdl_validate, }, + { + /* Q_GCON - GET_CONTAINER, v7 */ + "get_container", + "gcon", + 7, + MR_Q_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", + gcon7_fields, + 11, + "LOWER(name) LIKE LOWER('%s') AND cnt_id != 0", + 1, + NULL, + &gcon_validate, + }, + + { + /* Q_GCON - GET_CONTAINER, v9 */ + "get_container", + "gcon", + 9, + MR_Q_RETRIEVE, + "c", + CONTAINERS_TABLE, + "name, publicflg, 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, + 12, + "LOWER(name) LIKE LOWER('%s') AND cnt_id != 0", + 1, + NULL, + &gcon_validate, + }, + + { + /* Q_ACON - ADD_CONTAINER, v7 */ /* uses prefetch_value() for cnt_id */ + "add_container", + "acon", + 7, + MR_Q_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)", + acon7_fields, + 8, + 0, + 0, + NULL, + &acon7_validate, + }, + + { + /* Q_ACON - ADD_CONTAINER, v9 */ /* uses prefetch_value() for cnt_id */ + "add_container", + "acon", + 9, + MR_Q_APPEND, + "c", + CONTAINERS_TABLE, + "INTO containers (name, publicflg, description, location, contact, acl_type, acl_id, memacl_type, memacl_id, cnt_id) VALUES ('%s', %s, NVL('%s', CHR(0)), NVL('%s', CHR(0)), NVL('%s', CHR(0)), '%s', %d, '%s', %d, %s)", + acon_fields, + 9, + 0, + 0, + NULL, + &acon_validate, + }, + + { + /* Q_UCON - UPDATE_CONTAINER, v7 */ + "update_container", + "ucon", + 7, + MR_Q_UPDATE, + 0, + CONTAINERS_TABLE, + 0, + ucon7_fields, + 8, + 0, + 1, + NULL, + &ucon7_validate, + }, + + { + /* Q_UCON - UPDATE_CONTAINER, v9 */ + "update_container", + "ucon", + 9, + MR_Q_UPDATE, + 0, + CONTAINERS_TABLE, + 0, + ucon_fields, + 9, + 0, + 1, + NULL, + &ucon_validate, + }, + + { + /* Q_DCON - DELETE_CONTAINER, v7 */ + "delete_container", + "dcon", + 7, + MR_Q_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, + MR_Q_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, + MR_Q_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, + MR_Q_RETRIEVE, + "mcn", + MCNTMAP_TABLE, + "m.name, c.name FROM machine m, containers c, mcntmap mcn", + gmnm_fields, + 2, + "m.name LIKE 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, + MR_Q_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, + MR_Q_RETRIEVE, + NULL, + CONTAINERS_TABLE, + NULL, + gsoc_fields, + 1, + NULL, + 2, + NULL, + &gsoc_validate, + }, + + { + /* Q_GTLC - GET_TOPLEVEL_CONTAINERS, v7 */ + "get_toplevel_containers", + "gtlc", + 7, + MR_Q_RETRIEVE, + "c", + CONTAINERS_TABLE, + "name FROM containers", + gtlc_fields, + 1, + "name NOT LIKE '%%/%%'", + 0, + "name", + NULL, + }, + + { + /* Q_SCLI - SET_CONTAINER_LIST, v9 */ + "set_container_list", + "scli", + 9, + MR_Q_UPDATE, + 0, + CONTAINERS_TABLE, + 0, + scli_fields, + 1, + 0, + 1, + NULL, + &scli_validate, + }, + + { + /* Q_GCLI - GET_CONTAINER_LIST, v9 */ + "get_container_list", + "gcli", + 9, + MR_Q_RETRIEVE, + "c", + CONTAINERS_TABLE, + "c.name, l.name FROM containers c, list l", + gcli_fields, + 2, + "LOWER(c.name) = LOWER('%s') AND c.list_id = l.list_id AND c.list_id != 0", + 1, + NULL, + NULL, + }, + + { + /* G_GLIC - GET_LIST_CONTAINER, v9 */ + "get_list_container", + "glic", + 9, + MR_Q_RETRIEVE, + "c", + CONTAINERS_TABLE, + "c.name, l.name FROM containers c, list l", + glic_fields, + 2, + "l.list_id = %d AND l.list_id = c.list_id and c.list_id != 0", + 1, + NULL, + &glic_validate, + }, + }; -int QueryCount2 = (sizeof(Queries2) / sizeof(struct query)); +int QueryCount = (sizeof(Queries) / sizeof(struct query));