From: zacheiss Date: Fri, 29 Aug 2008 14:50:07 +0000 (+0000) Subject: Rename query type enums so they're less likely to collide with random X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/commitdiff_plain/b9f9ab1c66af1b6be0eb53e0797fd52c15752de3 Rename query type enums so they're less likely to collide with random external header-defined constants. --- diff --git a/server/qaccess.pc b/server/qaccess.pc index 3f84fde8..d0fac23c 100644 --- a/server/qaccess.pc +++ b/server/qaccess.pc @@ -295,7 +295,7 @@ int access_list(struct query *q, char *argv[], client *cl) if (find_member(memacl_type, memacl_id, cl)) return MR_SUCCESS; - if (flags || q->type == DELETE) + if (flags || q->type == MR_Q_DELETE) { if (!strcmp("USER", argv[1]) && *(int *)argv[2] == cl->users_id) return MR_SUCCESS; @@ -523,7 +523,7 @@ int access_host(struct query *q, char *argv[], client *cl) else idx = 2; - if (q->type == APPEND) + if (q->type == MR_Q_APPEND) { /* Non-query owner must set use to zero */ if (atoi(argv[6 + idx]) != 0) @@ -557,7 +557,7 @@ int access_host(struct query *q, char *argv[], client *cl) else return MR_PERM; } - else /* q-type == UPDATE */ + else /* q-type == MR_Q_UPDATE */ { EXEC SQL BEGIN DECLARE SECTION; int status, acomment, use, ocomment, snid; @@ -650,22 +650,22 @@ int access_ahal(struct query *q, char *argv[], client *cl) EXEC SQL END DECLARE SECTION; int status; - if (q->type == RETRIEVE) + if (q->type == MR_Q_RETRIEVE) return MR_SUCCESS; id = *(int *)argv[1]; - if (q->type == APPEND && isdigit(argv[0][0])) + if (q->type == MR_Q_APPEND && isdigit(argv[0][0])) return MR_BAD_CHAR; EXEC SQL SELECT count(name) INTO :cnt from hostalias WHERE mach_id = :id; if (dbms_errno) return mr_errcode; - /* if the type is APPEND, this is ahal and we need to make sure there + /* if the type is MR_Q_APPEND, this is ahal and we need to make sure there * will be no more than 2 aliases. If it's not, it must be dhal and * any owner will do. */ - if (q->type == APPEND && cnt >= 2) + if (q->type == MR_Q_APPEND && cnt >= 2) return MR_PERM; EXEC SQL SELECT m.owner_type, m.owner_id, s.owner_type, s.owner_id INTO :mtype, :mid, :stype, :sid FROM machine m, subnet s @@ -686,7 +686,7 @@ int access_ahal(struct query *q, char *argv[], client *cl) int access_snt(struct query *q, char *argv[], client *cl) { - if (q->type == RETRIEVE) + if (q->type == MR_Q_RETRIEVE) return MR_SUCCESS; return MR_PERM; @@ -803,7 +803,7 @@ int access_container(struct query *q, char *argv[], client *cl) /* if the container is public or the query is delete, grant access if client * is on owner list */ - if (flag || q->type == DELETE) + if (flag || q->type == MR_Q_DELETE) { EXEC SQL SELECT owner_type, owner_id INTO :machine_owner_type, :machine_owner_id diff --git a/server/qfollow.pc b/server/qfollow.pc index 157456e6..6ae39f92 100644 --- a/server/qfollow.pc +++ b/server/qfollow.pc @@ -816,7 +816,7 @@ int followup_aqot(struct query *q, char *argv[], client *cl) * conflicts between what is possible in the query table and what * is possible in SQL. */ - if (q->type == APPEND) + if (q->type == MR_Q_APPEND) { incremental_clear_before(); EXEC SQL INSERT INTO quota @@ -835,7 +835,7 @@ int followup_aqot(struct query *q, char *argv[], client *cl) if (dbms_errno) return mr_errcode; - if (q->type == APPEND) + if (q->type == MR_Q_APPEND) { EXEC SQL UPDATE tblstats SET appends = appends + 1, modtime = SYSDATE WHERE table_name = :tname; diff --git a/server/qrtn.pc b/server/qrtn.pc index bdb16f16..1bb74100 100644 --- a/server/qrtn.pc +++ b/server/qrtn.pc @@ -193,7 +193,7 @@ int mr_process_query(client *cl, char *name, int argc, char *argv_ro[], switch (q->type) { - case RETRIEVE: + case MR_Q_RETRIEVE: /* for queries that do not permit wildcarding, check if row uniquely exists */ if (v && v->field) @@ -245,7 +245,7 @@ int mr_process_query(client *cl, char *name, int argc, char *argv_ro[], break; - case UPDATE: + case MR_Q_UPDATE: /* see if row already exists */ if (v->field) { @@ -279,7 +279,7 @@ int mr_process_query(client *cl, char *name, int argc, char *argv_ro[], break; - case APPEND: + case MR_Q_APPEND: /* see if row already exists */ if (v->field) { @@ -322,7 +322,7 @@ int mr_process_query(client *cl, char *name, int argc, char *argv_ro[], status = (*v->post_rtn)(q, Argv, cl); break; - case DELETE: + case MR_Q_DELETE: /* see if row already exists */ if (v->field) { @@ -352,7 +352,7 @@ int mr_process_query(client *cl, char *name, int argc, char *argv_ro[], status = (*v->post_rtn)(q, Argv, cl); break; - case SPECIAL: + case MR_Q_SPECIAL: break; } @@ -366,7 +366,7 @@ out: status = mr_errcode; } - if (q->type == RETRIEVE) + if (q->type == MR_Q_RETRIEVE) EXEC SQL COMMIT WORK; else { @@ -545,7 +545,7 @@ int mr_verify_query(client *cl, struct query *q, int argc, char *argv_ro[]) /* check argument count */ argreq = q->argc; - if (q->type == UPDATE || q->type == APPEND) + if (q->type == MR_Q_UPDATE || q->type == MR_Q_APPEND) argreq += q->vcnt; if (argc != argreq) return MR_ARGS; @@ -757,7 +757,7 @@ int do_delete(struct query *q, char *qual, ** table - name of table objects are found in ** limit - should the ID be range limited ** - ** - called before an APPEND operation to set the next object id to + ** - called before an MR_Q_APPEND operation to set the next object id to ** be used for the new record to the next free value ** **/ diff --git a/server/qsetup.pc b/server/qsetup.pc index 2b4befd3..8c52a8c0 100644 --- a/server/qsetup.pc +++ b/server/qsetup.pc @@ -119,7 +119,7 @@ int setup_ausr(struct query *q, char *argv[], client *cl) if ((mr_errcode = prefetch_value(q, argv, cl)) != MR_SUCCESS) return mr_errcode; - /* If this is an UPDATE query, we're done. */ + /* If this is an MR_Q_UPDATE query, we're done. */ if (row == 2) return MR_SUCCESS; @@ -283,7 +283,7 @@ int setup_asnt(struct query *q, char *argv[], client *cl) char *account_number; /* Check for asnt or usnt. */ - if (q->type == APPEND) + if (q->type == MR_Q_APPEND) row = 0; else row = 1; @@ -1001,7 +1001,7 @@ int setup_dqot(struct query *q, char **argv, client *cl) * from within a setup_...() routine with the appropriate arguments. * * Correct functioning of this routine may depend on the assumption - * that this query is an APPEND. + * that this query is an MR_Q_APPEND. */ int prefetch_value(struct query *q, char **argv, client *cl) @@ -1027,7 +1027,7 @@ int prefetch_value(struct query *q, char **argv, client *cl) if (sqlca.sqlerrd[2] != 1) return MR_INTERNAL; - argc = q->argc + q->vcnt; /* end of Argv for APPENDs */ + argc = q->argc + q->vcnt; /* end of Argv for MR_Q_APPENDs */ sprintf(argv[argc], "%d", value); return MR_SUCCESS; @@ -1340,7 +1340,7 @@ int setup_aprn(struct query *q, char **argv, client *cl) EXEC SQL END DECLARE SECTION; /* Check for aprn or uprn. */ - if (q->type == APPEND) + if (q->type == MR_Q_APPEND) row = 0; else row = 1; @@ -1353,7 +1353,7 @@ int setup_aprn(struct query *q, char **argv, client *cl) return MR_BAD_CHAR; else { - if (q->type == APPEND) + if (q->type == MR_Q_APPEND) { EXEC SQL SELECT COUNT(name) INTO :count FROM printers WHERE name = :name OR duplexname = :name; @@ -1372,7 +1372,7 @@ int setup_aprn(struct query *q, char **argv, client *cl) if (*duplexname) { - if (q->type == APPEND) + if (q->type == MR_Q_APPEND) { EXEC SQL SELECT COUNT(name) INTO :count FROM printers WHERE name = :duplexname OR duplexname = :duplexname; diff --git a/server/queries2.c b/server/queries2.c index 6c25f36a..35306c5e 100644 --- a/server/queries2.c +++ b/server/queries2.c @@ -3958,7 +3958,7 @@ struct query Queries[] = { "get_all_logins", "galo", 2, - RETRIEVE, + MR_Q_RETRIEVE, "u", USERS_TABLE, "u.login, u.unix_uid, u.shell, u.last, u.first, u.middle FROM users u", @@ -3975,7 +3975,7 @@ struct query Queries[] = { "get_all_logins", "galo", 3, - RETRIEVE, + MR_Q_RETRIEVE, "u", USERS_TABLE, "u.login, u.unix_uid, u.shell, u.winconsoleshell, u.last, u.first, u.middle FROM users u", @@ -3992,7 +3992,7 @@ struct query Queries[] = { "get_all_active_logins", "gaal", 2, - RETRIEVE, + MR_Q_RETRIEVE, "u", USERS_TABLE, "u.login, u.unix_uid, u.shell, u.last, u.first, u.middle FROM users u", @@ -4009,7 +4009,7 @@ struct query Queries[] = { "get_all_active_logins", "gaal", 3, - RETRIEVE, + MR_Q_RETRIEVE, "u", USERS_TABLE, "u.login, u.unix_uid, u.shell, u.winconsoleshell, u.last, u.first, u.middle FROM users u", @@ -4026,7 +4026,7 @@ struct query Queries[] = { "get_user_account_by_login", "gual", 2, - RETRIEVE, + 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", @@ -4043,7 +4043,7 @@ struct query Queries[] = { "get_user_account_by_login", "gual", 3, - RETRIEVE, + 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", @@ -4060,7 +4060,7 @@ struct query Queries[] = { "get_user_account_by_login", "gual", 11, - RETRIEVE, + 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", @@ -4077,7 +4077,7 @@ struct query Queries[] = { "get_user_account_by_login", "gual", 12, - RETRIEVE, + 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", @@ -4094,7 +4094,7 @@ struct query Queries[] = { "get_user_account_by_uid", "guau", 2, - RETRIEVE, + 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", @@ -4111,7 +4111,7 @@ struct query Queries[] = { "get_user_account_by_uid", "guau", 3, - RETRIEVE, + 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", @@ -4128,7 +4128,7 @@ struct query Queries[] = { "get_user_account_by_uid", "guau", 11, - RETRIEVE, + 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", @@ -4145,7 +4145,7 @@ struct query Queries[] = { "get_user_account_by_uid", "guau", 12, - RETRIEVE, + 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", @@ -4162,7 +4162,7 @@ struct query Queries[] = { "get_user_account_by_name", "guan", 2, - RETRIEVE, + 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", @@ -4179,7 +4179,7 @@ struct query Queries[] = { "get_user_account_by_name", "guan", 3, - RETRIEVE, + 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", @@ -4196,7 +4196,7 @@ struct query Queries[] = { "get_user_account_by_name", "guan", 11, - RETRIEVE, + 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", @@ -4213,7 +4213,7 @@ struct query Queries[] = { "get_user_account_by_name", "guan", 12, - RETRIEVE, + 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", @@ -4230,7 +4230,7 @@ struct query Queries[] = { "get_user_account_by_class", "guac", 2, - RETRIEVE, + 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", @@ -4247,7 +4247,7 @@ struct query Queries[] = { "get_user_account_by_class", "guac", 3, - RETRIEVE, + 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", @@ -4264,7 +4264,7 @@ struct query Queries[] = { "get_user_account_by_class", "guac", 11, - RETRIEVE, + 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", @@ -4281,7 +4281,7 @@ struct query Queries[] = { "get_user_account_by_class", "guac", 12, - RETRIEVE, + 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", @@ -4298,7 +4298,7 @@ struct query Queries[] = { "get_user_account_by_id", "guai", 2, - RETRIEVE, + 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", @@ -4315,7 +4315,7 @@ struct query Queries[] = { "get_user_account_by_id", "guai", 3, - RETRIEVE, + 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", @@ -4332,7 +4332,7 @@ struct query Queries[] = { "get_user_account_by_id", "guai", 11, - RETRIEVE, + 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", @@ -4349,7 +4349,7 @@ struct query Queries[] = { "get_user_account_by_id", "guai", 12, - RETRIEVE, + 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", @@ -4366,7 +4366,7 @@ struct query Queries[] = { "get_user_account_by_sponsor", "guas", 12, - RETRIEVE, + MR_Q_RETRIEVE, 0, 0, 0, @@ -4383,7 +4383,7 @@ struct query Queries[] = { "get_user_by_login", "gubl", 2, - RETRIEVE, + 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", @@ -4400,7 +4400,7 @@ struct query Queries[] = { "get_user_by_login", "gubl", 3, - RETRIEVE, + 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", @@ -4417,7 +4417,7 @@ struct query Queries[] = { "get_user_by_uid", "gubu", 2, - RETRIEVE, + 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", @@ -4434,7 +4434,7 @@ struct query Queries[] = { "get_user_by_uid", "gubu", 3, - RETRIEVE, + 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", @@ -4451,7 +4451,7 @@ struct query Queries[] = { "get_user_by_name", "gubn", 2, - RETRIEVE, + 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", @@ -4468,7 +4468,7 @@ struct query Queries[] = { "get_user_by_name", "gubn", 3, - RETRIEVE, + 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", @@ -4485,7 +4485,7 @@ struct query Queries[] = { "get_user_by_class", "gubc", 2, - RETRIEVE, + 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", @@ -4502,7 +4502,7 @@ struct query Queries[] = { "get_user_by_class", "gubc", 3, - RETRIEVE, + 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", @@ -4519,7 +4519,7 @@ struct query Queries[] = { "get_user_by_mitid", "gubm", 2, - RETRIEVE, + 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", @@ -4536,7 +4536,7 @@ struct query Queries[] = { "get_user_by_mitid", "gubm", 3, - RETRIEVE, + 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", @@ -4553,7 +4553,7 @@ struct query Queries[] = { "add_user_account", "auac", 2, - APPEND, + MR_Q_APPEND, "u", USERS_TABLE, /* We set signature to "NVL(CHR(0), '%s')", which is to say, "CHR(0)", @@ -4573,7 +4573,7 @@ struct query Queries[] = { "add_user_account", "auac", 3, - APPEND, + MR_Q_APPEND, "u", USERS_TABLE, /* We set signature to "NVL(CHR(0), '%s')", which is to say, "CHR(0)", @@ -4593,7 +4593,7 @@ struct query Queries[] = { "add_user_account", "auac", 11, - APPEND, + MR_Q_APPEND, "u", USERS_TABLE, /* We set signature to "NVL(CHR(0), '%s')", which is to say, "CHR(0)", @@ -4613,7 +4613,7 @@ struct query Queries[] = { "add_user_account", "auac", 12, - APPEND, + MR_Q_APPEND, "u", USERS_TABLE, /* We set signature to "NVL(CHR(0), '%s')", which is to say, "CHR(0)", @@ -4633,7 +4633,7 @@ struct query Queries[] = { "add_user", "ausr", 2, - APPEND, + 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)", @@ -4650,7 +4650,7 @@ struct query Queries[] = { "add_user", "ausr", 3, - APPEND, + 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)", @@ -4667,7 +4667,7 @@ struct query Queries[] = { "add_user", "ausr", 11, - APPEND, + 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)", @@ -4684,7 +4684,7 @@ struct query Queries[] = { "add_user", "ausr", 12, - APPEND, + 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)", @@ -4701,7 +4701,7 @@ struct query Queries[] = { "register_user", "rusr", 2, - APPEND, + MR_Q_APPEND, 0, 0, 0, @@ -4718,7 +4718,7 @@ struct query Queries[] = { "update_user_account", "uuac", 2, - UPDATE, + MR_Q_UPDATE, "u", USERS_TABLE, /* See comment in auac about signature. */ @@ -4736,7 +4736,7 @@ struct query Queries[] = { "update_user_account", "uuac", 3, - UPDATE, + MR_Q_UPDATE, "u", USERS_TABLE, /* See comment in auac about signature. */ @@ -4754,7 +4754,7 @@ struct query Queries[] = { "update_user_account", "uuac", 11, - UPDATE, + MR_Q_UPDATE, "u", USERS_TABLE, /* See comment in auac about signature. */ @@ -4772,7 +4772,7 @@ struct query Queries[] = { "update_user_account", "uuac", 12, - UPDATE, + MR_Q_UPDATE, "u", USERS_TABLE, /* See comment in auac about signature. */ @@ -4790,7 +4790,7 @@ struct query Queries[] = { "update_user", "uusr", 2, - UPDATE, + 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'", @@ -4807,7 +4807,7 @@ struct query Queries[] = { "update_user", "uusr", 3, - UPDATE, + 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'", @@ -4824,7 +4824,7 @@ struct query Queries[] = { "update_user", "uusr", 11, - UPDATE, + 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)) ", @@ -4841,7 +4841,7 @@ struct query Queries[] = { "update_user", "uusr", 12, - UPDATE, + 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)) ", @@ -4858,7 +4858,7 @@ struct query Queries[] = { "update_user_shell", "uush", 2, - UPDATE, + MR_Q_UPDATE, "u", USERS_TABLE, "users SET shell = '%s'", @@ -4875,7 +4875,7 @@ struct query Queries[] = { "update_user_windows_shell", "uuws", 2, - UPDATE, + MR_Q_UPDATE, "u", USERS_TABLE, "users SET winconsoleshell = '%s'", @@ -4892,7 +4892,7 @@ struct query Queries[] = { "update_user_status", "uust", 2, - UPDATE, + MR_Q_UPDATE, "u", USERS_TABLE, "users SET status = %s", @@ -4909,7 +4909,7 @@ struct query Queries[] = { "update_user_security_status", "uuss", 2, - UPDATE, + MR_Q_UPDATE, "u", USERS_TABLE, "users SET secure = %s", @@ -4926,7 +4926,7 @@ struct query Queries[] = { "delete_user", "dusr", 2, - DELETE, + MR_Q_DELETE, "u", USERS_TABLE, NULL, @@ -4943,7 +4943,7 @@ struct query Queries[] = { "add_user_reservation", "aurv", 2, - UPDATE, + MR_Q_UPDATE, 0, USERS_TABLE, 0, @@ -4960,7 +4960,7 @@ struct query Queries[] = { "get_user_reservations", "gurv", 2, - RETRIEVE, + MR_Q_RETRIEVE, 0, USERS_TABLE, 0, @@ -4977,7 +4977,7 @@ struct query Queries[] = { "get_user_by_reservation", "gubr", 2, - RETRIEVE, + MR_Q_RETRIEVE, 0, USERS_TABLE, 0, @@ -4994,7 +4994,7 @@ struct query Queries[] = { "delete_user_reservation", "durv", 2, - UPDATE, + MR_Q_UPDATE, 0, USERS_TABLE, 0, @@ -5011,7 +5011,7 @@ struct query Queries[] = { "get_kerberos_user_map", "gkum", 2, - RETRIEVE, + MR_Q_RETRIEVE, "k", KRBMAP_TABLE, "u.login, str.string FROM krbmap km, users u, strings str", @@ -5028,7 +5028,7 @@ struct query Queries[] = { "add_kerberos_user_map", "akum", 2, - APPEND, + MR_Q_APPEND, "k", KRBMAP_TABLE, "INTO krbmap (users_id, string_id) VALUES (%d, %d)", @@ -5045,7 +5045,7 @@ struct query Queries[] = { "delete_kerberos_user_map", "dkum", 2, - DELETE, + MR_Q_DELETE, "k", KRBMAP_TABLE, 0, @@ -5062,7 +5062,7 @@ struct query Queries[] = { "get_finger_by_login", "gfbl", 2, - RETRIEVE, + 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", @@ -5079,7 +5079,7 @@ struct query Queries[] = { "update_finger_by_login", "ufbl", 2, - UPDATE, + 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))", @@ -5096,7 +5096,7 @@ struct query Queries[] = { "get_pobox", "gpob", 2, - RETRIEVE, + MR_Q_RETRIEVE, "u", USERS_TABLE, "login, potype, users_id, CHR(0), TO_CHAR(pmodtime, 'DD-mon-YYYY HH24:MI:SS'), pmodby, pmodwith FROM users", @@ -5113,7 +5113,7 @@ struct query Queries[] = { "get_all_poboxes", "gapo", 2, - RETRIEVE, + MR_Q_RETRIEVE, "u", USERS_TABLE, "login, potype, pop_id || ':' || box_id FROM users", @@ -5130,7 +5130,7 @@ struct query Queries[] = { "get_poboxes_pop", "gpop", 2, - RETRIEVE, + MR_Q_RETRIEVE, "u", USERS_TABLE, "login, potype, users_id FROM users", @@ -5147,7 +5147,7 @@ struct query Queries[] = { "get_poboxes_smtp", "gpos", 2, - RETRIEVE, + MR_Q_RETRIEVE, "u", USERS_TABLE, "login, potype, users_id FROM users", @@ -5164,7 +5164,7 @@ struct query Queries[] = { "set_pobox", "spob", 2, - UPDATE, + MR_Q_UPDATE, 0, USERS_TABLE, 0, @@ -5181,7 +5181,7 @@ struct query Queries[] = { "set_pobox_pop", "spop", 2, - UPDATE, + MR_Q_UPDATE, 0, USERS_TABLE, 0, @@ -5198,7 +5198,7 @@ struct query Queries[] = { "delete_pobox", "dpob", 2, - UPDATE, + MR_Q_UPDATE, "u", USERS_TABLE, "users SET potype = 'NONE'", @@ -5215,7 +5215,7 @@ struct query Queries[] = { "get_host", "ghst", 2, - RETRIEVE, + 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", @@ -5232,7 +5232,7 @@ struct query Queries[] = { "get_host", "ghst", 6, - RETRIEVE, + 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", @@ -5249,7 +5249,7 @@ struct query Queries[] = { "get_host", "ghst", 8, - RETRIEVE, + 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", @@ -5266,7 +5266,7 @@ struct query Queries[] = { "get_host_by_hwaddr", "ghbh", 2, - RETRIEVE, + 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", @@ -5283,7 +5283,7 @@ struct query Queries[] = { "get_host_by_hwaddr", "ghbh", 6, - RETRIEVE, + 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", @@ -5300,7 +5300,7 @@ struct query Queries[] = { "get_host_by_hwaddr", "ghbh", 8, - RETRIEVE, + 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", @@ -5317,7 +5317,7 @@ struct query Queries[] = { "get_host_by_account_number", "ghba", 8, - RETRIEVE, + 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", @@ -5334,7 +5334,7 @@ struct query Queries[] = { "get_host_hwaddr", "ghha", 2, - RETRIEVE, + MR_Q_RETRIEVE, "m", MACHINE_TABLE, "m.hwaddr FROM machine m", @@ -5351,7 +5351,7 @@ struct query Queries[] = { "add_host", "ahst", 2, - APPEND, + 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)", @@ -5368,7 +5368,7 @@ struct query Queries[] = { "add_host", "ahst", 6, - APPEND, + 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)", @@ -5385,7 +5385,7 @@ struct query Queries[] = { "add_host", "ahst", 8, - APPEND, + 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)", @@ -5402,7 +5402,7 @@ struct query Queries[] = { "update_host", "uhst", 2, - UPDATE, + 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", @@ -5419,7 +5419,7 @@ struct query Queries[] = { "update_host", "uhst", 6, - UPDATE, + 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", @@ -5436,7 +5436,7 @@ struct query Queries[] = { "update_host", "uhst", 8, - UPDATE, + 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", @@ -5453,7 +5453,7 @@ struct query Queries[] = { "update_host_hwaddr", "uhha", 2, - UPDATE, + MR_Q_UPDATE, "m", MACHINE_TABLE, "machine SET hwaddr = NVL('%s', CHR(0))", @@ -5470,7 +5470,7 @@ struct query Queries[] = { "delete_host", "dhst", 2, - DELETE, + MR_Q_DELETE, "m", MACHINE_TABLE, NULL, @@ -5487,7 +5487,7 @@ struct query Queries[] = { "get_machine", "gmac", 2, - RETRIEVE, + MR_Q_RETRIEVE, "m", MACHINE_TABLE, "name, vendor, TO_CHAR(modtime, 'DD-mon-YYYY HH24:MI:SS'), modby, modwith FROM machine", @@ -5504,7 +5504,7 @@ struct query Queries[] = { "get_hostalias", "ghal", 2, - RETRIEVE, + MR_Q_RETRIEVE, "a", HOSTALIAS_TABLE, "a.name, m.name FROM hostalias a, machine m", @@ -5521,7 +5521,7 @@ struct query Queries[] = { "add_hostalias", "ahal", 2, - APPEND, + MR_Q_APPEND, "a", HOSTALIAS_TABLE, "INTO hostalias (name, mach_id) VALUES (UPPER('%s'), %d)", @@ -5538,7 +5538,7 @@ struct query Queries[] = { "delete_hostalias", "dhal", 2, - DELETE, + MR_Q_DELETE, "a", HOSTALIAS_TABLE, NULL, @@ -5555,7 +5555,7 @@ struct query Queries[] = { "get_subnet", "gsnt", 2, - RETRIEVE, + 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", @@ -5572,7 +5572,7 @@ struct query Queries[] = { "get_subnet", "gsnt", 8, - RETRIEVE, + 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", @@ -5589,7 +5589,7 @@ struct query Queries[] = { "add_subnet", "asnt", 2, - APPEND, + 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)", @@ -5606,7 +5606,7 @@ struct query Queries[] = { "add_subnet", "asnt", 8, - APPEND, + 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)", @@ -5623,7 +5623,7 @@ struct query Queries[] = { "update_subnet", "usnt", 2, - UPDATE, + 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", @@ -5640,7 +5640,7 @@ struct query Queries[] = { "update_subnet", "usnt", 8, - UPDATE, + 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", @@ -5657,7 +5657,7 @@ struct query Queries[] = { "delete_subnet", "dsnt", 2, - DELETE, + MR_Q_DELETE, "s", SUBNET_TABLE, NULL, @@ -5674,7 +5674,7 @@ struct query Queries[] = { "get_cluster", "gclu", 2, - RETRIEVE, + MR_Q_RETRIEVE, "c", CLUSTERS_TABLE, "name, description, location, TO_CHAR(modtime, 'DD-mon-YYYY HH24:MI:SS'), modby, modwith FROM clusters", @@ -5691,7 +5691,7 @@ struct query Queries[] = { "add_cluster", "aclu", 2, - APPEND, + MR_Q_APPEND, "c", CLUSTERS_TABLE, "INTO clusters (name, description, location, clu_id) VALUES ('%s', NVL('%s', CHR(0)), NVL('%s', CHR(0)), %s)", @@ -5708,7 +5708,7 @@ struct query Queries[] = { "update_cluster", "uclu", 2, - UPDATE, + MR_Q_UPDATE, "c", CLUSTERS_TABLE, "clusters SET name = '%s', description = NVL('%s', CHR(0)), location = NVL('%s', CHR(0))", @@ -5725,7 +5725,7 @@ struct query Queries[] = { "delete_cluster", "dclu", 2, - DELETE, + MR_Q_DELETE, "c", CLUSTERS_TABLE, NULL, @@ -5742,7 +5742,7 @@ struct query Queries[] = { "get_machine_to_cluster_map", "gmcm", 2, - RETRIEVE, + MR_Q_RETRIEVE, "mcm", MCMAP_TABLE, "m.name, c.name FROM machine m, clusters c, mcmap mcm", @@ -5759,7 +5759,7 @@ struct query Queries[] = { "add_machine_to_cluster", "amtc", 2, - APPEND, + MR_Q_APPEND, "mcm", MCMAP_TABLE, "INTO mcmap (mach_id, clu_id) VALUES (%d, %d)", @@ -5776,7 +5776,7 @@ struct query Queries[] = { "delete_machine_from_cluster", "dmfc", 2, - DELETE, + MR_Q_DELETE, "mcm", MCMAP_TABLE, 0, @@ -5793,7 +5793,7 @@ struct query Queries[] = { "get_cluster_data", "gcld", 2, - RETRIEVE, + MR_Q_RETRIEVE, "svc", SVC_TABLE, "c.name, svc.serv_label, svc.serv_cluster FROM svc svc, clusters c", @@ -5810,7 +5810,7 @@ struct query Queries[] = { "add_cluster_data", "acld", 2, - APPEND, + MR_Q_APPEND, "svc", SVC_TABLE, "INTO svc (clu_id, serv_label, serv_cluster) VALUES (%d, '%s', '%s')", @@ -5827,7 +5827,7 @@ struct query Queries[] = { "delete_cluster_data", "dcld", 2, - DELETE, + MR_Q_DELETE, "svc", SVC_TABLE, NULL, @@ -5844,7 +5844,7 @@ struct query Queries[] = { "get_list_info", "glin", 2, - RETRIEVE, + MR_Q_RETRIEVE, "l", LIST_TABLE, "name, active, publicflg, hidden, maillist, grouplist, gid, acl_type, acl_id, description, TO_CHAR(modtime, 'DD-mon-YYYY HH24:MI:SS'), modby, modwith FROM list", @@ -5861,7 +5861,7 @@ struct query Queries[] = { "get_list_info", "glin", 3, - RETRIEVE, + 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", @@ -5878,7 +5878,7 @@ struct query Queries[] = { "get_list_info", "glin", 4, - RETRIEVE, + 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", @@ -5895,7 +5895,7 @@ struct query Queries[] = { "get_list_info", "glin", 10, - RETRIEVE, + 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", @@ -5912,7 +5912,7 @@ struct query Queries[] = { "expand_list_names", "exln", 2, - RETRIEVE, + MR_Q_RETRIEVE, "l", LIST_TABLE, "name FROM list", @@ -5929,7 +5929,7 @@ struct query Queries[] = { "add_list", "alis", 2, - APPEND, + 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)", @@ -5946,7 +5946,7 @@ struct query Queries[] = { "add_list", "alis", 3, - APPEND, + 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)", @@ -5963,7 +5963,7 @@ struct query Queries[] = { "add_list", "alis", 4, - APPEND, + 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)", @@ -5980,7 +5980,7 @@ struct query Queries[] = { "add_list", "alis", 10, - APPEND, + 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)", @@ -5997,7 +5997,7 @@ struct query Queries[] = { "update_list", "ulis", 2, - UPDATE, + 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))", @@ -6014,7 +6014,7 @@ struct query Queries[] = { "update_list", "ulis", 3, - UPDATE, + 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))", @@ -6031,7 +6031,7 @@ struct query Queries[] = { "update_list", "ulis", 4, - UPDATE, + 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))", @@ -6048,7 +6048,7 @@ struct query Queries[] = { "update_list", "ulis", 10, - UPDATE, + 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))", @@ -6065,7 +6065,7 @@ struct query Queries[] = { "delete_list", "dlis", 2, - DELETE, + MR_Q_DELETE, "l", LIST_TABLE, NULL, @@ -6082,7 +6082,7 @@ struct query Queries[] = { "add_member_to_list", "amtl", 2, - APPEND, + MR_Q_APPEND, 0, IMEMBERS_TABLE, 0, @@ -6099,7 +6099,7 @@ struct query Queries[] = { "add_tagged_member_to_list", "atml", 2, - APPEND, + MR_Q_APPEND, 0, IMEMBERS_TABLE, 0, @@ -6116,7 +6116,7 @@ struct query Queries[] = { "tag_member_of_list", "tmol", 2, - UPDATE, + MR_Q_UPDATE, 0, IMEMBERS_TABLE, 0, @@ -6133,7 +6133,7 @@ struct query Queries[] = { "delete_member_from_list", "dmfl", 2, - DELETE, + MR_Q_DELETE, 0, IMEMBERS_TABLE, NULL, @@ -6150,7 +6150,7 @@ struct query Queries[] = { "get_ace_use", "gaus", 2, - RETRIEVE, + MR_Q_RETRIEVE, 0, 0, 0, @@ -6167,7 +6167,7 @@ struct query Queries[] = { "get_host_by_owner", "ghbo", 2, - RETRIEVE, + MR_Q_RETRIEVE, 0, 0, 0, @@ -6184,7 +6184,7 @@ struct query Queries[] = { "qualified_get_lists", "qgli", 2, - RETRIEVE, + MR_Q_RETRIEVE, 0, LIST_TABLE, 0, @@ -6201,7 +6201,7 @@ struct query Queries[] = { "get_members_of_list", "gmol", 2, - RETRIEVE, + MR_Q_RETRIEVE, NULL, IMEMBERS_TABLE, NULL, @@ -6218,7 +6218,7 @@ struct query Queries[] = { "get_end_members_of_list", "geml", 2, - RETRIEVE, + MR_Q_RETRIEVE, NULL, IMEMBERS_TABLE, NULL, @@ -6235,7 +6235,7 @@ struct query Queries[] = { "get_tagged_members_of_list", "gtml", 2, - RETRIEVE, + MR_Q_RETRIEVE, NULL, IMEMBERS_TABLE, NULL, @@ -6252,7 +6252,7 @@ struct query Queries[] = { "get_lists_of_member", "glom", 2, - RETRIEVE, + MR_Q_RETRIEVE, 0, IMEMBERS_TABLE, 0, @@ -6269,7 +6269,7 @@ struct query Queries[] = { "count_members_of_list", "cmol", 2, - RETRIEVE, + MR_Q_RETRIEVE, 0, IMEMBERS_TABLE, 0, @@ -6286,7 +6286,7 @@ struct query Queries[] = { "get_server_info", "gsin", 2, - RETRIEVE, + 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", @@ -6303,7 +6303,7 @@ struct query Queries[] = { "qualified_get_server", "qgsv", 2, - RETRIEVE, + MR_Q_RETRIEVE, 0, SERVERS_TABLE, 0, @@ -6320,7 +6320,7 @@ struct query Queries[] = { "add_server_info", "asin", 2, - APPEND, + 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)", @@ -6337,7 +6337,7 @@ struct query Queries[] = { "update_server_info", "usin", 2, - UPDATE, + 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", @@ -6354,7 +6354,7 @@ struct query Queries[] = { "reset_server_error", "rsve", 2, - UPDATE, + MR_Q_UPDATE, "s", SERVERS_TABLE, "servers SET harderror = 0, dfcheck = dfgen", @@ -6371,7 +6371,7 @@ struct query Queries[] = { "set_server_internal_flags", "ssif", 2, - UPDATE, + MR_Q_UPDATE, "s", SERVERS_TABLE, "servers SET dfgen = %s, dfcheck = %s, inprogress = %s, harderror = %s, errmsg = NVL('%s', CHR(0))", @@ -6388,7 +6388,7 @@ struct query Queries[] = { "delete_server_info", "dsin", 2, - DELETE, + MR_Q_DELETE, "s", SERVERS_TABLE, NULL, @@ -6405,7 +6405,7 @@ struct query Queries[] = { "get_server_host_info", "gshi", 2, - RETRIEVE, + 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", @@ -6422,7 +6422,7 @@ struct query Queries[] = { "qualified_get_server_host", "qgsh", 2, - RETRIEVE, + MR_Q_RETRIEVE, 0, SERVERHOSTS_TABLE, 0, @@ -6439,7 +6439,7 @@ struct query Queries[] = { "add_server_host_info", "ashi", 2, - APPEND, + 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)))", @@ -6456,7 +6456,7 @@ struct query Queries[] = { "update_server_host_info", "ushi", 2, - UPDATE, + MR_Q_UPDATE, "sh", SERVERHOSTS_TABLE, "serverhosts SET enable = %s, value1 = %s, value2 = %s, value3 = NVL('%s', CHR(0))", @@ -6473,7 +6473,7 @@ struct query Queries[] = { "reset_server_host_error", "rshe", 2, - UPDATE, + MR_Q_UPDATE, "sh", SERVERHOSTS_TABLE, "serverhosts SET hosterror = 0", @@ -6490,7 +6490,7 @@ struct query Queries[] = { "set_server_host_override", "ssho", 2, - UPDATE, + MR_Q_UPDATE, "sh", SERVERHOSTS_TABLE, "serverhosts SET override = 1", @@ -6507,7 +6507,7 @@ struct query Queries[] = { "set_server_host_internal", "sshi", 2, - UPDATE, + 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", @@ -6524,7 +6524,7 @@ struct query Queries[] = { "delete_server_host_info", "dshi", 2, - DELETE, + MR_Q_DELETE, "sh", SERVERHOSTS_TABLE, NULL, @@ -6541,7 +6541,7 @@ struct query Queries[] = { "get_server_locations", "gslo", 2, - RETRIEVE, + MR_Q_RETRIEVE, "sh", SERVERHOSTS_TABLE, "sh.service, m.name FROM serverhosts sh, machine m", @@ -6558,7 +6558,7 @@ struct query Queries[] = { "get_filesys_by_label", "gfsl", 2, - RETRIEVE, + 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", @@ -6575,7 +6575,7 @@ struct query Queries[] = { "get_filesys_by_machine", "gfsm", 2, - RETRIEVE, + 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", @@ -6592,7 +6592,7 @@ struct query Queries[] = { "get_filesys_by_nfsphys", "gfsn", 2, - RETRIEVE, + 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", @@ -6609,7 +6609,7 @@ struct query Queries[] = { "get_filesys_by_group", "gfsg", 2, - RETRIEVE, + 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", @@ -6626,7 +6626,7 @@ struct query Queries[] = { "get_filesys_by_path", "gfsp", 2, - RETRIEVE, + 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", @@ -6643,7 +6643,7 @@ struct query Queries[] = { "add_filesys", "afil", 2, - APPEND, + 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)), NVL('%s', CHR(0)), '%s', NVL('%s', CHR(0)), %d, %d, %s, '%s', %s)", @@ -6660,7 +6660,7 @@ struct query Queries[] = { "update_filesys", "ufil", 2, - UPDATE, + MR_Q_UPDATE, "fs", FILESYS_TABLE, "filesys SET label = '%s', type = '%s', mach_id = %d, name = NVL('%s', CHR(0)), mount = NVL('%s', CHR(0)), rwaccess = '%s', comments = NVL('%s', CHR(0)), owner = %d, owners = %d, createflg = %s, lockertype = '%s'", @@ -6677,7 +6677,7 @@ struct query Queries[] = { "delete_filesys", "dfil", 2, - DELETE, + MR_Q_DELETE, "fs", FILESYS_TABLE, NULL, @@ -6694,7 +6694,7 @@ struct query Queries[] = { "get_fsgroup_members", "gfgm", 2, - RETRIEVE, + MR_Q_RETRIEVE, "fg", FSGROUP_TABLE, "fs.label, fg.key FROM fsgroup fg, filesys fs", @@ -6711,7 +6711,7 @@ struct query Queries[] = { "add_filesys_to_fsgroup", "aftg", 2, - APPEND, + MR_Q_APPEND, "fg", FSGROUP_TABLE, "INTO fsgroup (group_id, filsys_id, key) VALUES (%d, %d, '%s')", @@ -6728,7 +6728,7 @@ struct query Queries[] = { "remove_filesys_from_fsgroup", "rffg", 2, - DELETE, + MR_Q_DELETE, "fg", FSGROUP_TABLE, NULL, @@ -6745,7 +6745,7 @@ struct query Queries[] = { "get_all_nfsphys", "ganf", 2, - RETRIEVE, + 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", @@ -6762,7 +6762,7 @@ struct query Queries[] = { "get_nfsphys", "gnfp", 2, - RETRIEVE, + 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", @@ -6779,7 +6779,7 @@ struct query Queries[] = { "add_nfsphys", "anfp", 2, - APPEND, + 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)", @@ -6796,7 +6796,7 @@ struct query Queries[] = { "update_nfsphys", "unfp", 2, - UPDATE, + MR_Q_UPDATE, "np", NFSPHYS_TABLE, "nfsphys SET device = NVL('%s', CHR(0)), status = %s, allocated = %s, partsize = %s", @@ -6813,7 +6813,7 @@ struct query Queries[] = { "adjust_nfsphys_allocation", "ajnf", 2, - UPDATE, + MR_Q_UPDATE, "np", NFSPHYS_TABLE, "nfsphys SET allocated = allocated + %s", @@ -6830,7 +6830,7 @@ struct query Queries[] = { "delete_nfsphys", "dnfp", 2, - DELETE, + MR_Q_DELETE, "np", NFSPHYS_TABLE, NULL, @@ -6847,7 +6847,7 @@ struct query Queries[] = { "get_quota", "gqot", 2, - RETRIEVE, + 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", @@ -6864,7 +6864,7 @@ struct query Queries[] = { "get_quota_by_filesys", "gqbf", 2, - RETRIEVE, + 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", @@ -6881,7 +6881,7 @@ struct query Queries[] = { "add_quota", "aqot", 2, - APPEND, + MR_Q_APPEND, 0, QUOTA_TABLE, "INTO quota (filsys_id, type, entity_id, quota, phys_id) VALUES ('%s', %d, %d, %s, %s)", @@ -6898,7 +6898,7 @@ struct query Queries[] = { "update_quota", "uqot", 2, - UPDATE, + MR_Q_UPDATE, 0, QUOTA_TABLE, "quota SET quota = %s", @@ -6915,7 +6915,7 @@ struct query Queries[] = { "delete_quota", "dqot", 2, - DELETE, + MR_Q_DELETE, 0, QUOTA_TABLE, NULL, @@ -6932,7 +6932,7 @@ struct query Queries[] = { "get_nfs_quota", "gnfq", 2, - RETRIEVE, + 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", @@ -6949,7 +6949,7 @@ struct query Queries[] = { "get_nfs_quotas_by_partition", "gnqp", 2, - RETRIEVE, + 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", @@ -6966,7 +6966,7 @@ struct query Queries[] = { "add_nfs_quota", "anfq", 2, - APPEND, + MR_Q_APPEND, 0, QUOTA_TABLE, "INTO quota (type, filsys_id, entity_id, quota, phys_id ) VALUES ('USER', %d, %d, %s, %s)", @@ -6983,7 +6983,7 @@ struct query Queries[] = { "update_nfs_quota", "unfq", 2, - UPDATE, + MR_Q_UPDATE, 0, QUOTA_TABLE, "quota SET quota = %s", @@ -7000,7 +7000,7 @@ struct query Queries[] = { "delete_nfs_quota", "dnfq", 2, - DELETE, + MR_Q_DELETE, 0, QUOTA_TABLE, NULL, @@ -7017,7 +7017,7 @@ struct query Queries[] = { "get_zephyr_class", "gzcl", 2, - RETRIEVE, + 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", @@ -7034,7 +7034,7 @@ struct query Queries[] = { "get_zephyr_class", "gzcl", 5, - RETRIEVE, + 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", @@ -7051,7 +7051,7 @@ struct query Queries[] = { "add_zephyr_class", "azcl", 2, - APPEND, + 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)", @@ -7068,7 +7068,7 @@ struct query Queries[] = { "add_zephyr_class", "azcl", 5, - APPEND, + 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)", @@ -7085,7 +7085,7 @@ struct query Queries[] = { "update_zephyr_class", "uzcl", 2, - UPDATE, + 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", @@ -7102,7 +7102,7 @@ struct query Queries[] = { "update_zephyr_class", "uzcl", 5, - UPDATE, + 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", @@ -7119,7 +7119,7 @@ struct query Queries[] = { "delete_zephyr_class", "dzcl", 2, - DELETE, + MR_Q_DELETE, "z", ZEPHYR_TABLE, 0, @@ -7136,7 +7136,7 @@ struct query Queries[] = { "get_server_host_access", "gsha", 2, - RETRIEVE, + 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", @@ -7153,7 +7153,7 @@ struct query Queries[] = { "add_server_host_access", "asha", 2, - APPEND, + MR_Q_APPEND, "ha", HOSTACCESS_TABLE, "INTO hostaccess (mach_id, acl_type, acl_id) VALUES (%d, '%s', %d)", @@ -7170,7 +7170,7 @@ struct query Queries[] = { "update_server_host_access", "usha", 2, - UPDATE, + MR_Q_UPDATE, "ha", HOSTACCESS_TABLE, "hostaccess SET acl_type = '%s', acl_id = %d", @@ -7187,7 +7187,7 @@ struct query Queries[] = { "delete_server_host_access", "dsha", 2, - DELETE, + MR_Q_DELETE, "ha", HOSTACCESS_TABLE, 0, @@ -7204,7 +7204,7 @@ struct query Queries[] = { "get_acl", "gacl", 2, - RETRIEVE, + MR_Q_RETRIEVE, "ac", ACL_TABLE, "m.name, ac.target, ac.kind, l.name FROM acl ac, machine m, list l", @@ -7221,7 +7221,7 @@ struct query Queries[] = { "add_acl", "aacl", 2, - APPEND, + MR_Q_APPEND, "ac", ACL_TABLE, "INTO acl (mach_id, target, kind, list_id) VALUES (%d, '%s', '%s', %d)", @@ -7238,7 +7238,7 @@ struct query Queries[] = { "delete_acl", "dacl", 2, - DELETE, + MR_Q_DELETE, "ac", ACL_TABLE, 0, @@ -7255,7 +7255,7 @@ struct query Queries[] = { "get_service", "gsvc", 2, - RETRIEVE, + MR_Q_RETRIEVE, "ss", SERVICES_TABLE, "name, protocol, port, description, TO_CHAR(modtime, 'DD-mon-YYYY HH24:MI:SS'), modby, modwith FROM services", @@ -7272,7 +7272,7 @@ struct query Queries[] = { "add_service", "asvc", 2, - APPEND, + MR_Q_APPEND, "ss", SERVICES_TABLE, "INTO services (name, protocol, port, description) VALUES ('%s', '%s', %s, NVL('%s', CHR(0)))", @@ -7289,7 +7289,7 @@ struct query Queries[] = { "delete_service", "dsvc", 2, - DELETE, + MR_Q_DELETE, "ss", SERVICES_TABLE, 0, @@ -7306,7 +7306,7 @@ struct query Queries[] = { "get_printer", "gprn", 2, - RETRIEVE, + 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", @@ -7323,7 +7323,7 @@ struct query Queries[] = { "get_printer_by_duplexname", "gpbd", 2, - RETRIEVE, + 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", @@ -7340,7 +7340,7 @@ struct query Queries[] = { "get_printer_by_ethernet", "gpbe", 2, - RETRIEVE, + 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", @@ -7357,7 +7357,7 @@ struct query Queries[] = { "get_printer_by_hostname", "gpbh", 2, - RETRIEVE, + 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", @@ -7374,7 +7374,7 @@ struct query Queries[] = { "get_printer_by_rm", "gpbr", 2, - RETRIEVE, + 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", @@ -7391,7 +7391,7 @@ struct query Queries[] = { "get_printer_by_location", "gpbl", 2, - RETRIEVE, + 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", @@ -7408,7 +7408,7 @@ struct query Queries[] = { "get_printer_by_contact", "gpbc", 2, - RETRIEVE, + 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", @@ -7425,7 +7425,7 @@ struct query Queries[] = { "add_printer", "aprn", 2, - APPEND, + 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)))", @@ -7442,7 +7442,7 @@ struct query Queries[] = { "update_printer", "uprn", 2, - UPDATE, + 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))", @@ -7459,7 +7459,7 @@ struct query Queries[] = { "delete_printer", "dprn", 2, - DELETE, + MR_Q_DELETE, "pr", PRINTERS_TABLE, 0, @@ -7476,7 +7476,7 @@ struct query Queries[] = { "get_print_server", "gpsv", 2, - RETRIEVE, + 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", @@ -7493,7 +7493,7 @@ struct query Queries[] = { "add_print_server", "apsv", 2, - APPEND, + 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)", @@ -7510,7 +7510,7 @@ struct query Queries[] = { "update_print_server", "upsv", 2, - UPDATE, + MR_Q_UPDATE, "ps", PRINTSERVERS_TABLE, "printservers SET kind = '%s', printer_types = %d, owner_type = '%s', owner_id = %d, lpc_acl = %d", @@ -7527,7 +7527,7 @@ struct query Queries[] = { "delete_print_server", "dpsv", 2, - DELETE, + MR_Q_DELETE, "ps", PRINTSERVERS_TABLE, 0, @@ -7544,7 +7544,7 @@ struct query Queries[] = { "get_alias", "gali", 2, - RETRIEVE, + MR_Q_RETRIEVE, "a", ALIAS_TABLE, "name, type, trans FROM alias", @@ -7561,7 +7561,7 @@ struct query Queries[] = { "add_alias", "aali", 2, - APPEND, + MR_Q_APPEND, "a", ALIAS_TABLE, "INTO alias (name, type, trans) VALUES ('%s', '%s', '%s')", @@ -7578,7 +7578,7 @@ struct query Queries[] = { "delete_alias", "dali", 2, - DELETE, + MR_Q_DELETE, "a", ALIAS_TABLE, NULL, @@ -7595,7 +7595,7 @@ struct query Queries[] = { "get_value", "gval", 2, - RETRIEVE, + MR_Q_RETRIEVE, "val", NUMVALUES_TABLE, "value FROM numvalues", @@ -7612,7 +7612,7 @@ struct query Queries[] = { "add_value", "aval", 2, - APPEND, + MR_Q_APPEND, "val", NUMVALUES_TABLE, "INTO numvalues (name, value) VALUES ('%s', %s)", @@ -7629,7 +7629,7 @@ struct query Queries[] = { "update_value", "uval", 2, - UPDATE, + MR_Q_UPDATE, "val", NUMVALUES_TABLE, "numvalues SET value = %s", @@ -7646,7 +7646,7 @@ struct query Queries[] = { "delete_value", "dval", 2, - DELETE, + MR_Q_DELETE, "val", NUMVALUES_TABLE, NULL, @@ -7663,7 +7663,7 @@ struct query Queries[] = { "get_all_table_stats", "gats", 2, - RETRIEVE, + MR_Q_RETRIEVE, "tbs", TBLSTATS_TABLE, "table_name, appends, updates, deletes, TO_CHAR(modtime, 'DD-mon-YYYY HH24:MI:SS') FROM tblstats", @@ -7680,7 +7680,7 @@ struct query Queries[] = { "_set_debug_level", "_sdl", 2, - UPDATE, + MR_Q_UPDATE, NULL, 0, NULL, @@ -7697,7 +7697,7 @@ struct query Queries[] = { "get_container", "gcon", 7, - RETRIEVE, + 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", @@ -7714,7 +7714,7 @@ struct query Queries[] = { "get_container", "gcon", 9, - RETRIEVE, + 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", @@ -7731,7 +7731,7 @@ struct query Queries[] = { "add_container", "acon", 7, - APPEND, + 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)", @@ -7748,7 +7748,7 @@ struct query Queries[] = { "add_container", "acon", 9, - APPEND, + 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)", @@ -7765,7 +7765,7 @@ struct query Queries[] = { "update_container", "ucon", 7, - UPDATE, + MR_Q_UPDATE, 0, CONTAINERS_TABLE, 0, @@ -7782,7 +7782,7 @@ struct query Queries[] = { "update_container", "ucon", 9, - UPDATE, + MR_Q_UPDATE, 0, CONTAINERS_TABLE, 0, @@ -7799,7 +7799,7 @@ struct query Queries[] = { "delete_container", "dcon", 7, - DELETE, + MR_Q_DELETE, "c", CONTAINERS_TABLE, NULL, @@ -7816,7 +7816,7 @@ struct query Queries[] = { "add_machine_to_container", "amcn", 7, - APPEND, + MR_Q_APPEND, "mcn", MCNTMAP_TABLE, "INTO mcntmap (mach_id, cnt_id) VALUES (%d, %d)", @@ -7833,7 +7833,7 @@ struct query Queries[] = { "delete_machine_from_container", "dmcn", 7, - DELETE, + MR_Q_DELETE, "mcn", MCNTMAP_TABLE, 0, @@ -7850,7 +7850,7 @@ struct query Queries[] = { "get_machine_to_container_map", "gmnm", 7, - RETRIEVE, + MR_Q_RETRIEVE, "mcn", MCNTMAP_TABLE, "m.name, c.name FROM machine m, containers c, mcntmap mcn", @@ -7867,7 +7867,7 @@ struct query Queries[] = { "get_machines_of_container", "gmoc", 7, - RETRIEVE, + MR_Q_RETRIEVE, NULL, MCNTMAP_TABLE, NULL, @@ -7884,7 +7884,7 @@ struct query Queries[] = { "get_subcontainers_of_container", "gsoc", 7, - RETRIEVE, + MR_Q_RETRIEVE, NULL, CONTAINERS_TABLE, NULL, @@ -7901,7 +7901,7 @@ struct query Queries[] = { "get_toplevel_containers", "gtlc", 7, - RETRIEVE, + MR_Q_RETRIEVE, "c", CONTAINERS_TABLE, "name FROM containers", @@ -7918,7 +7918,7 @@ struct query Queries[] = { "set_container_list", "scli", 9, - UPDATE, + MR_Q_UPDATE, 0, CONTAINERS_TABLE, 0, @@ -7935,7 +7935,7 @@ struct query Queries[] = { "get_container_list", "gcli", 9, - RETRIEVE, + MR_Q_RETRIEVE, "c", CONTAINERS_TABLE, "c.name, l.name FROM containers c, list l", @@ -7952,7 +7952,7 @@ struct query Queries[] = { "get_list_container", "glic", 9, - RETRIEVE, + MR_Q_RETRIEVE, "c", CONTAINERS_TABLE, "c.name, l.name FROM containers c, list l", diff --git a/server/query.h b/server/query.h index d193c78a..7a663def 100644 --- a/server/query.h +++ b/server/query.h @@ -8,7 +8,7 @@ */ /* Query Types */ -enum query_type {RETRIEVE, UPDATE, APPEND, DELETE, SPECIAL}; +enum query_type {MR_Q_RETRIEVE, MR_Q_UPDATE, MR_Q_APPEND, MR_Q_DELETE, MR_Q_SPECIAL}; /* Query Definition Structure */ struct query diff --git a/server/qvalidate.pc b/server/qvalidate.pc index f07db30f..2d7a35ae 100644 --- a/server/qvalidate.pc +++ b/server/qvalidate.pc @@ -204,7 +204,7 @@ int validate_id(struct query *q, char *argv[], struct valobj *vo) return MR_EXISTS; } else if (status == MR_NO_MATCH && tbl == STRINGS_TABLE && - (q->type == APPEND || q->type == UPDATE)) + (q->type == MR_Q_APPEND || q->type == MR_Q_UPDATE)) { if (strlen(name) >= STRINGS_STRING_SIZE) return MR_ARG_TOO_LONG; @@ -415,7 +415,7 @@ int validate_typedata(struct query *q, char *argv[], struct valobj *vo) return MR_STRING; if (status == MR_NO_MATCH) { - if (q->type != APPEND && q->type != UPDATE) + if (q->type != MR_Q_APPEND && q->type != MR_Q_UPDATE) return MR_STRING; if (strlen(name) >= STRINGS_STRING_SIZE) return MR_ARG_TOO_LONG;