#include <ctype.h>
#include <stdlib.h>
#include <string.h>
-#ifdef GDSS
-#include "gdss.h"
-#endif /* GDSS */
EXEC SQL INCLUDE sqlca;
int set_modtime(struct query *q, char *argv[], client *cl)
{
char *name, *entity, *table;
- int who;
+ int who, row = 0;
entity = cl->entity;
who = cl->client_id;
table = table_name[q->rtable];
- name = argv[0];
+
+ if (q->type == MR_Q_UPDATE)
+ row = 1;
+
+ name = argv[0 + row];
sprintf(stmt_buf, "UPDATE %s SET modtime = SYSDATE, modby = %d, "
"modwith = '%s' WHERE name = '%s'", table, who, entity, name);
return MR_SUCCESS;
}
-
-/* fixes the modby field. This will be the second to last thing in the
- * argv, the argv length is determined from the query structure. It is
- * passed as a pointer to an integer. This will either turn it into a
- * username, or # + the users_id.
+/* sets the modtime on an entry in services table, where argv[0] contains
+ * the service name.
*/
-int followup_fix_modby(struct query *q, struct save_queue *sq,
- struct validate *v, int (*action)(int, char *[], void *),
- void *actarg, client *cl)
+
+int set_service_modtime(struct query *q, char *argv[], client *cl)
{
- int i, j;
- char **argv;
- int id, status;
+ EXEC SQL BEGIN DECLARE SECTION;
+ char *service, *protocol, *entity;
+ int who;
+ EXEC SQL END DECLARE SECTION;
+
+ entity = cl->entity;
+ who = cl->client_id;
+
+ service = argv[0];
+ protocol = argv[1];
+
+ EXEC SQL UPDATE services SET modtime = SYSDATE, modby = :who,
+ modwith = :entity WHERE name = :service AND protocol = :protocol;
- i = q->vcnt - 2;
- while (sq_get_data(sq, &argv))
- {
- id = atoi(argv[i]);
- if (id > 0)
- status = id_to_name(id, USERS_TABLE, &argv[i]);
- else
- status = id_to_name(-id, STRINGS_TABLE, &argv[i]);
- if (status && status != MR_NO_MATCH)
- return status;
- (*action)(q->vcnt, argv, actarg);
- for (j = 0; j < q->vcnt; j++)
- free(argv[j]);
- free(argv);
- }
- sq_destroy(sq);
return MR_SUCCESS;
}
-
-/* After retrieving a user account, fix the modby field and signature.
- * The modby field is the second to last thing in the
+/* fixes the modby field. This will be the second to last thing in the
* argv, the argv length is determined from the query structure. It is
* passed as a pointer to an integer. This will either turn it into a
- * username, or # + the users_id. Only "gua*" queries have a signature,
- * these are ones with U_END return values. "gub*" queries also use this
- * routine but don't have a signature.
+ * username, or # + the users_id.
*/
-int followup_guax(struct query *q, struct save_queue *sq, struct validate *v,
- int (*action)(int, char *[], void *), void *actarg,
- client *cl)
+int followup_fix_modby(struct query *q, struct save_queue *sq,
+ struct validate *v, int (*action)(int, char *[], void *),
+ void *actarg, client *cl)
{
int i, j;
char **argv;
-#ifdef GDSS
- unsigned char sigbuf[512];
- char *kname;
- SigInfo si;
- EXEC SQL BEGIN DECLARE SECTION;
- int timestamp, who;
- char *login;
- char rsig[USERS_SIGNATURE_SIZE];
- EXEC SQL VAR rsig IS STRING(USERS_SIGNATURE_SIZE);
- EXEC SQL END DECLARE SECTION;
-#endif /* GDSS */
int id, status;
i = q->vcnt - 2;
status = id_to_name(-id, STRINGS_TABLE, &argv[i]);
if (status && status != MR_NO_MATCH)
return status;
-#ifdef GDSS
- if (q->vcnt == U_END && strlen(argv[U_SIGNATURE]))
- {
- login = strtrim(argv[U_NAME]);
- EXEC SQL SELECT signature, sigdate, sigwho
- INTO :rsig, :timestamp, :who FROM users
- WHERE login = :login;
- if (dbms_errno)
- return mr_errcode;
- kname = malloc(0);
- status = id_to_name(who, STRINGS_TABLE, &kname);
- si.timestamp = timestamp;
- si.SigInfoVersion = 0; /* XXXXX this isn't used */
- kname_parse(si.pname, si.pinst, si.prealm, kname);
- free(kname);
- si.rawsig = (unsigned char *)xstrdup(rsig);
- GDSS_Recompose(&si, sigbuf);
- free(si.rawsig);
- free(argv[U_SIGNATURE]);
- argv[U_SIGNATURE] = xstrdup(sigbuf);
- }
-#endif /* GDSS */
(*action)(q->vcnt, argv, actarg);
for (j = 0; j < q->vcnt; j++)
free(argv[j]);
return MR_SUCCESS;
}
-
/**
** followup_ausr - add finger and pobox entries, set_user_modtime
**
** Inputs:
** argv[0] - login (add_user)
- ** argv[3] - last name
- ** argv[4] - first name
- ** argv[5] - middle name
+ ** argv[U_LAST] - last name
+ ** argv[U_FIRST] - first name
+ ** argv[U_MIDDLE] - middle name
**
**/
char *login, *entity, *name;
char fullname[USERS_FIRST_SIZE + USERS_MIDDLE_SIZE + USERS_LAST_SIZE];
EXEC SQL END DECLARE SECTION;
-#ifdef GDSS
- char databuf[USERS_LOGIN_SIZE + USERS_CLEARID_SIZE];
- EXEC SQL BEGIN DECLARE SECTION;
- char rawsig[512];
- int sigwho, timestamp;
- EXEC SQL END DECLARE SECTION;
- SigInfo si;
-#endif /* GDSS */
/* build fullname */
- if (strlen(argv[4]) && strlen(argv[5]))
- sprintf(fullname, "%s %s %s", argv[4], argv[5], argv[3]);
- else if (strlen(argv[4]))
- sprintf(fullname, "%s %s", argv[4], argv[3]);
+ if (strlen(argv[U_FIRST]) && strlen(argv[U_MIDDLE]))
+ sprintf(fullname, "%s %s %s", argv[U_FIRST], argv[U_MIDDLE],
+ argv[U_LAST]);
+ else if (strlen(argv[U_FIRST]))
+ sprintf(fullname, "%s %s", argv[U_FIRST], argv[U_LAST]);
else
- sprintf(fullname, "%s", argv[3]);
-
-#ifdef GDSS
- if (q->vcnt == U_END && *argv[U_SIGNATURE])
- {
- sprintf(databuf, "%s:%s", argv[U_NAME], argv[U_MITID]);
- /* skip bytes for timestamp & kname */
- si.rawsig = (unsigned char *) rawsig;
- status = GDSS_Verify(databuf, strlen(databuf), argv[U_SIGNATURE], &si);
- if (strlen(rawsig) > mr_sig_length)
- {
- com_err(whoami, 0, "GDSS signature would be truncated.");
- return MR_INTERNAL;
- }
- if (status == 0)
- {
- name = kname_unparse(si.pname, si.pinst, si.prealm);
- status = name_to_id(name, STRINGS_TABLE, &sigwho);
- if (status == MR_NO_MATCH)
- sigwho = add_string(name);
- else if (status)
- return status;
- timestamp = si.timestamp;
- }
- else
- return gdss2et(status);
- }
- else
- {
- rawsig[0] = '\0';
- sigwho = 0;
- timestamp = 0;
- }
-#endif /* GDSS */
+ sprintf(fullname, "%s", argv[U_LAST]);
login = argv[0];
who = cl->client_id;
entity = cl->entity;
/* create finger entry, pobox & set modtime on user */
-#ifdef GDSS
- EXEC SQL UPDATE users
- SET modtime = SYSDATE, modby = :who, modwith = :entity,
- fullname = NVL(:fullname, CHR(0)), affiliation = type,
- signature = NVL(:rawsig, CHR(0)), sigdate = :timestamp,
- sigwho = :sigwho, fmodtime = SYSDATE, fmodby = :who,
- fmodwith = :entity, potype = 'NONE', pmodtime = SYSDATE,
- pmodby = :who, pmodwith = :entity
- WHERE login = :login;
-#else /* GDSS */
EXEC SQL UPDATE users
SET modtime = SYSDATE, modby = :who, modwith = :entity,
fullname = NVL(:fullname, CHR(0)), affiliation = type,
fmodtime = SYSDATE, fmodby = :who, fmodwith = :entity,
potype = 'NONE', pmodtime = SYSDATE, pmodby = :who, pmodwith = :entity
WHERE login = :login;
-#endif /* GDSS */
-
- return MR_SUCCESS;
-}
-
-
-/**
- ** followup_uuac - do signature, set_user_modtime
- **
- ** Inputs:
- ** argv[0] - login (add_user)
- ** argv[U_SIGNATURE] - sig
- **
- **/
-
-int followup_uuac(struct query *q, char *argv[], client *cl)
-{
- EXEC SQL BEGIN DECLARE SECTION;
- int who, status, id;
- char *entity, *name;
- EXEC SQL END DECLARE SECTION;
-#ifdef GDSS
- char databuf[USERS_LOGIN_SIZE + USERS_CLEARID_SIZE];
- EXEC SQL BEGIN DECLARE SECTION;
- char rawsig[512];
- char *login;
- int sigwho, timestamp;
- EXEC SQL END DECLARE SECTION;
- SigInfo si;
-#endif /* GDSS */
- id = *(int *)argv[0];
- who = cl->client_id;
- entity = cl->entity;
-
-#ifdef GDSS
- if (q->vcnt == U_MODTIME && *argv[U_SIGNATURE + 1])
- {
- login = malloc(0);
- status = id_to_name(id, USERS_TABLE, &login);
- sprintf(databuf, "%s:%s", login, argv[U_MITID + 1]);
- free(login);
- /* skip bytes for timestamp & kname */
- si.rawsig = (unsigned char *) rawsig;
- status = GDSS_Verify(databuf, strlen(databuf), argv[U_SIGNATURE + 1],
- &si);
- if (strlen(rawsig) > mr_sig_length)
- {
- com_err(whoami, 0, "GDSS signature would be truncated.");
- return MR_INTERNAL;
- }
- if (status == 0)
- {
- name = kname_unparse(si.pname, si.pinst, si.prealm);
- status = name_to_id(name, STRINGS_TABLE, &sigwho);
- if (status == MR_NO_MATCH)
- sigwho = add_string(name);
- else if (status)
- return status;
- timestamp = si.timestamp;
- }
- else
- return gdss2et(status);
- }
- else
- {
- rawsig[0] = '\0';
- sigwho = 0;
- timestamp = 0;
- }
-#endif /* GDSS */
-
- /* create finger entry, pobox & set modtime on user */
-
-#ifdef GDSS
- EXEC SQL UPDATE users SET modtime = SYSDATE, modby = :who, modwith = :entity,
- signature = NVL(:rawsig, CHR(0)), sigdate = :timestamp, sigwho = :sigwho
- WHERE users_id = :id;
-#else /* GDSS */
- EXEC SQL UPDATE users SET modtime = SYSDATE, modby = :who, modwith = :entity
- WHERE users_id = :id;
-#endif /* GDSS */
return MR_SUCCESS;
}
-
/* followup_gpob: fixes argv[2] and argv[3] based on the pobox type.
* Then completes the upcall to the user.
*
char *ptype, *p;
int mid, sid, status, i;
EXEC SQL BEGIN DECLARE SECTION;
- int users_id;
+ int users_id, pid, iid, bid, eid;
char mach[MACHINE_NAME_SIZE], fs[FILESYS_LABEL_SIZE];
char str[STRINGS_STRING_SIZE];
EXEC SQL END DECLARE SECTION;
ptype = argv[1];
users_id = atoi(argv[2]);
- if (!strcmp(ptype, "POP"))
+ EXEC SQL SELECT pop_id, imap_id, box_id, exchange_id INTO :pid, :iid, :bid, :eid
+ FROM users WHERE users_id = :users_id;
+ if (sqlca.sqlcode)
+ return MR_USER;
+
+ if (ptype[0] == 'S')
{
+ /* SMTP or SPLIT */
+ EXEC SQL SELECT string INTO :str FROM strings
+ WHERE string_id = :bid;
+ if (sqlca.sqlcode)
+ return MR_STRING;
+
+ /* If SMTP, don't bother fetching IMAP and POP boxes. */
+ if (ptype[1] == 'M')
+ pid = iid = eid = 0;
+ }
+ if (iid)
+ {
+ /* IMAP, or SPLIT with IMAP */
+ EXEC SQL SELECT f.label, m.name INTO :fs, :mach
+ FROM filesys f, machine m
+ WHERE f.filsys_id = :iid AND f.mach_id = m.mach_id;
+ if (sqlca.sqlcode)
+ return MR_FILESYS;
+ }
+ if (pid)
+ {
+ /* POP, or SPLIT with POP */
EXEC SQL SELECT m.name INTO :mach FROM machine m, users u
WHERE u.users_id = :users_id AND u.pop_id = m.mach_id;
if (sqlca.sqlcode)
return MR_MACHINE;
- free(argv[2]);
+ }
+ if (eid)
+ {
+ /* EXCHANGE, or SPLIT with EXCHANGE */
+ EXEC SQL SELECT m.name INTO :mach FROM machine m, users u
+ WHERE u.users_id = :users_id AND u.exchange_id = m.mach_id;
+ if (sqlca.sqlcode)
+ return MR_MACHINE;
+ }
+
+ free(argv[2]);
+ free(argv[3]);
+
+ /* Now assemble the right answer. */
+ if (!strcmp(ptype, "POP") || !strcmp(ptype, "EXCHANGE"))
+ {
argv[2] = xstrdup(strtrim(mach));
- free(argv[3]);
argv[3] = xmalloc(strlen(argv[0]) + strlen(argv[2]) + 2);
sprintf(argv[3], "%s@%s", argv[0], argv[2]);
}
else if (!strcmp(ptype, "SMTP"))
{
- EXEC SQL SELECT s.string INTO :str FROM strings s, users u
- WHERE u.users_id = :users_id AND u.box_id = s.string_id;
- if (sqlca.sqlcode)
- return MR_STRING;
- free(argv[2]);
- free(argv[3]);
argv[2] = xstrdup(strtrim(str));
argv[3] = xstrdup(str);
}
else if (!strcmp(ptype, "IMAP"))
{
- EXEC SQL SELECT f.label, m.name INTO :fs, :mach
- FROM filesys f, machine m, users u
- WHERE u.users_id = :users_id AND f.filsys_id = u.imap_id
- AND f.mach_id = m.mach_id;
- if (sqlca.sqlcode)
- return MR_FILESYS;
- free(argv[2]);
argv[2] = xstrdup(strtrim(fs));
- free(argv[3]);
argv[3] = xmalloc(strlen(argv[0]) + strlen(strtrim(mach)) + 2);
sprintf(argv[3], "%s@%s", argv[0], mach);
}
+ else if (!strcmp(ptype, "SPLIT"))
+ {
+ argv[2] = xstrdup(strtrim(str));
+ argv[3] = xmalloc(strlen(argv[0]) + strlen(strtrim(mach)) +
+ strlen(str) + 4);
+ sprintf(argv[3], "%s@%s, %s", argv[0], mach, str);
+ }
else /* ptype == "NONE" */
goto skip;
return MR_SUCCESS;
}
+/* Fix an ace_name, based on its type. */
-/* followup_gsnt: fix the ace_name in argv[7]. argv[6] will contain the
- * ace_type: "LIST", "USER", or "NONE". Decode the id in argv[7] into the
- * proper name based on the type, and repace that string in the argv.
- * Also fixes the modby field by called followup_fix_modby.
- */
+static int fix_ace(char *type, char **name)
+{
+ int id = atoi(*name);
+
+ if (!strcmp(type, "LIST"))
+ return id_to_name(id, LIST_TABLE, name);
+ else if (!strcmp(type, "USER"))
+ return id_to_name(id, USERS_TABLE, name);
+ else if (!strcmp(type, "KERBEROS"))
+ return id_to_name(id, STRINGS_TABLE, name);
+ else
+ {
+ free(*name);
+ if (!strcmp(type, "NONE"))
+ *name = xstrdup("NONE");
+ else
+ *name = xstrdup("???");
+ return MR_SUCCESS;
+ }
+}
+
+
+/* followup_gsnt: fix the ace_name and modby */
int followup_gsnt(struct query *q, struct save_queue *sq, struct validate *v,
int (*action)(int, char *[], void *), void *actarg,
client *cl)
{
- char **argv, *type;
- int id, i, idx, status;
+ char **argv;
+ int status, idx;
- idx = 8;
+ if (q->version < 8)
+ idx = 0;
+ else
+ idx = 3;
while (sq_get_data(sq, &argv))
{
mr_trim_args(q->vcnt, argv);
- id = atoi(argv[i = q->vcnt - 2]);
- if (id > 0)
- status = id_to_name(id, USERS_TABLE, &argv[i]);
- else
- status = id_to_name(-id, STRINGS_TABLE, &argv[i]);
- if (status && status != MR_NO_MATCH)
- return status;
-
- id = atoi(argv[idx]);
- type = argv[idx - 1];
-
- if (!strcmp(type, "LIST"))
- status = id_to_name(id, LIST_TABLE, &argv[idx]);
- else if (!strcmp(type, "USER"))
- status = id_to_name(id, USERS_TABLE, &argv[idx]);
- else if (!strcmp(type, "KERBEROS"))
- status = id_to_name(id, STRINGS_TABLE, &argv[idx]);
- else if (!strcmp(type, "NONE"))
- {
- status = 0;
- free(argv[idx]);
- argv[idx] = xstrdup("NONE");
- }
- else
- {
- status = 0;
- free(argv[idx]);
- argv[idx] = xstrdup("???");
- }
+ status = fix_ace(argv[7 + idx], &argv[8 + idx]);
if (status && status != MR_NO_MATCH)
return status;
-
- /* send the data */
- (*action)(q->vcnt, argv, actarg);
-
- /* free saved data */
- for (i = 0; i < q->vcnt; i++)
- free(argv[i]);
- free(argv);
}
- sq_destroy(sq);
- return MR_SUCCESS;
+ return followup_fix_modby(q, sq, v, action, actarg, cl);
}
-/* followup_ghst: fix the ace_name in argv[12]. argv[11] will contain the
- * ace_type: "LIST", "USER", or "NONE". Decode the id in argv[12] into the
- * proper name based on the type, and repace that string in the argv.
- * Also fixes the modby field by called followup_fix_modby.
- */
+/* followup_ghst: fix the ace_name, strings and modby */
int followup_ghst(struct query *q, struct save_queue *sq, struct validate *v,
int (*action)(int, char *[], void *), void *actarg,
client *cl)
{
- char **argv, *type;
- int id, i, idx, status;
+ char **argv;
+ int id, status, idx;
+
+ if (q->version < 6)
+ idx = 0;
+ else if (q->version >= 6 && q->version < 8)
+ idx = 1;
+ else
+ idx = 2;
while (sq_get_data(sq, &argv))
{
mr_trim_args(q->vcnt, argv);
- id = atoi(argv[i = q->vcnt - 2]);
- if (id > 0)
- status = id_to_name(id, USERS_TABLE, &argv[i]);
- else
- status = id_to_name(-id, STRINGS_TABLE, &argv[i]);
- if (status && status != MR_NO_MATCH)
- return status;
-
- id = atoi(argv[13]);
- status = id_to_name(id, STRINGS_TABLE, &argv[13]);
+ id = atoi(argv[13 + idx]);
+ status = id_to_name(id, STRINGS_TABLE, &argv[13 + idx]);
if (status)
return status;
- id = atoi(argv[14]);
- status = id_to_name(id, STRINGS_TABLE, &argv[14]);
+ id = atoi(argv[14 + idx]);
+ status = id_to_name(id, STRINGS_TABLE, &argv[14 + idx]);
if (status)
return status;
- id = atoi(argv[16]);
+ id = atoi(argv[16 + idx]);
if (id < 0)
- status = id_to_name(-id, STRINGS_TABLE, &argv[16]);
+ status = id_to_name(-id, STRINGS_TABLE, &argv[16 + idx]);
else
- status = id_to_name(id, USERS_TABLE, &argv[16]);
+ status = id_to_name(id, USERS_TABLE, &argv[16 + idx]);
if (status && status != MR_NO_MATCH)
return status;
- idx = 12;
- id = atoi(argv[idx]);
- type = strtrim(argv[idx - 1]);
-
- if (!strcmp(type, "LIST"))
- status = id_to_name(id, LIST_TABLE, &argv[idx]);
- else if (!strcmp(type, "USER"))
- status = id_to_name(id, USERS_TABLE, &argv[idx]);
- else if (!strcmp(type, "KERBEROS"))
- status = id_to_name(id, STRINGS_TABLE, &argv[idx]);
- else if (!strcmp(type, "NONE"))
- {
- status = 0;
- free(argv[idx]);
- argv[idx] = xstrdup("NONE");
- }
- else
- {
- status = 0;
- free(argv[idx]);
- argv[idx] = xstrdup("???");
- }
+ status = fix_ace(argv[11 + idx], &argv[12 + idx]);
if (status && status != MR_NO_MATCH)
return status;
-
- /* send the data */
- (*action)(q->vcnt, argv, actarg);
-
- /* free saved data */
- for (i = 0; i < q->vcnt; i++)
- free(argv[i]);
- free(argv);
}
- sq_destroy(sq);
- return MR_SUCCESS;
+ return followup_fix_modby(q, sq, v, action, actarg, cl);
}
-/* followup_glin: fix the ace_name in argv[8]. argv[7] will contain the
- * ace_type: "LIST", "USER", or "NONE". Decode the id in argv[8] into the
- * proper name based on the type, and repace that string in the argv.
- * Also fixes the modby field by called followup_fix_modby.
- */
+/* followup_glin: fix the ace_name, modace_name, expiration, and modby */
int followup_glin(struct query *q, struct save_queue *sq, struct validate *v,
int (*action)(int, char *[], void *), void *actarg,
client *cl)
{
- char **argv, *type;
- int id, i, idx, status;
-
- idx = 8;
- if (!strcmp(q->shortname, "gsin"))
- idx = 12;
+ char **argv;
+ int status;
while (sq_get_data(sq, &argv))
{
mr_trim_args(q->vcnt, argv);
- id = atoi(argv[i = q->vcnt - 2]);
- if (id > 0)
- status = id_to_name(id, USERS_TABLE, &argv[i]);
+ if (q->version == 2)
+ status = fix_ace(argv[7], &argv[8]);
+ else if (q->version > 2 && q->version < 10)
+ status = fix_ace(argv[8], &argv[9]);
else
- status = id_to_name(-id, STRINGS_TABLE, &argv[i]);
+ status = fix_ace(argv[10], &argv[11]);
+
if (status && status != MR_NO_MATCH)
return status;
- id = atoi(argv[idx]);
- type = argv[idx - 1];
-
- if (!strcmp(type, "LIST"))
- status = id_to_name(id, LIST_TABLE, &argv[idx]);
- else if (!strcmp(type, "USER"))
- status = id_to_name(id, USERS_TABLE, &argv[idx]);
- else if (!strcmp(type, "KERBEROS"))
- status = id_to_name(id, STRINGS_TABLE, &argv[idx]);
- else if (!strcmp(type, "NONE"))
+ if (q->version > 3)
{
- status = 0;
- free(argv[idx]);
- argv[idx] = xstrdup("NONE");
- }
- else
- {
- status = 0;
- free(argv[idx]);
- argv[idx] = xstrdup("???");
+ if (q->version < 10)
+ status = fix_ace(argv[10], &argv[11]);
+ else if (q->version >= 10)
+ status = fix_ace(argv[12], &argv[13]);
+
+ if (status && status != MR_NO_MATCH)
+ return status;
}
- if (status && status != MR_NO_MATCH)
- return status;
- if (!strcmp(q->shortname, "glin") && atoi(argv[6]) == -1)
+ if (atoi(argv[6]) == -1)
{
argv[6] = xrealloc(argv[6], strlen(UNIQUE_GID) + 1);
strcpy(argv[6], UNIQUE_GID);
}
+ }
- /* send the data */
- (*action)(q->vcnt, argv, actarg);
+ return followup_fix_modby(q, sq, v, action, actarg, cl);
+}
- /* free saved data */
- for (i = 0; i < q->vcnt; i++)
- free(argv[i]);
- free(argv);
+/* followup_gsin: fix the ace_name and modby. */
+int followup_gsin(struct query *q, struct save_queue *sq, struct validate *v,
+ int (*action)(int, char *[], void *), void *actarg,
+ client *cl)
+{
+ char **argv;
+ int status;
+
+ while (sq_get_data(sq, &argv))
+ {
+ mr_trim_args(q->vcnt, argv);
+
+ status = fix_ace(argv[11], &argv[12]);
+ if (status && status != MR_NO_MATCH)
+ return status;
}
- sq_destroy(sq);
- return MR_SUCCESS;
+ return followup_fix_modby(q, sq, v, action, actarg, cl);
}
int followup_gpsv(struct query *q, struct save_queue *sq, struct validate *v,
int (*action)(int, char *[], void *), void *actarg,
client *cl)
{
- char **argv, *type;
- int id, i, status;
+ char **argv;
+ int status;
while (sq_get_data(sq, &argv))
{
mr_trim_args(q->vcnt, argv);
- id = atoi(argv[PRINTSERVER_OWNER_NAME]);
- type = argv[PRINTSERVER_OWNER_TYPE];
-
- if (!strcmp(type, "LIST"))
- status = id_to_name(id, LIST_TABLE, &argv[PRINTSERVER_OWNER_NAME]);
- else if (!strcmp(type, "USER"))
- status = id_to_name(id, USERS_TABLE, &argv[PRINTSERVER_OWNER_NAME]);
- else if (!strcmp(type, "KERBEROS"))
- status = id_to_name(id, STRINGS_TABLE, &argv[PRINTSERVER_OWNER_NAME]);
- else
- {
- status = 0;
- free(argv[PRINTSERVER_OWNER_NAME]);
- argv[PRINTSERVER_OWNER_NAME] = xstrdup("NONE");
- }
+ status = fix_ace(argv[PRINTSERVER_OWNER_TYPE],
+ &argv[PRINTSERVER_OWNER_NAME]);
if (status && status != MR_NO_MATCH)
return status;
}
idx = 4;
else
idx = 3;
+
while (sq_get_data(sq, &argv))
{
if (idx == 4)
* 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
if (dbms_errno)
return mr_errcode;
- flush_name(argv[0], table);
- if (q->type == APPEND)
+ if (q->type == MR_Q_APPEND)
{
EXEC SQL UPDATE tblstats SET appends = appends + 1, modtime = SYSDATE
WHERE table_name = :tname;
if (dbms_errno)
return mr_errcode;
- flush_name(argv[0], table);
EXEC SQL UPDATE tblstats SET deletes = deletes + 1, modtime = SYSDATE
WHERE table_name = :tname;
int (*action)(int, char *[], void *), void *actarg,
client *cl)
{
- int id, i, status;
+ int i, n, status;
char **argv;
+ if (q->version < 5)
+ n = 8;
+ else
+ n = 10;
+
while (sq_get_data(sq, &argv))
{
mr_trim_args(q->vcnt, argv);
- id = atoi(argv[i = q->vcnt - 2]);
- if (id > 0)
- status = id_to_name(id, USERS_TABLE, &argv[i]);
- else
- status = id_to_name(-id, STRINGS_TABLE, &argv[i]);
- if (status && status != MR_NO_MATCH)
- return status;
-
- for (i = 1; i < 8; i += 2)
+ for (i = 1; i < n; i += 2)
{
- id = atoi(argv[i + 1]);
- if (!strcmp(argv[i], "LIST"))
- status = id_to_name(id, LIST_TABLE, &argv[i + 1]);
- else if (!strcmp(argv[i], "USER"))
- status = id_to_name(id, USERS_TABLE, &argv[i + 1]);
- else if (!strcmp(argv[i], "KERBEROS"))
- status = id_to_name(id, STRINGS_TABLE, &argv[i + 1]);
- else if (!strcmp(argv[i], "NONE"))
- {
- status = 0;
- free(argv[i + 1]);
- argv[i + 1] = xstrdup("NONE");
- }
- else
- {
- status = 0;
- free(argv[i + 1]);
- argv[i + 1] = xstrdup("???");
- }
+ status = fix_ace(argv[i], &argv[i + 1]);
if (status && status != MR_NO_MATCH)
return status;
}
-
- /* send the data */
- (*action)(q->vcnt, argv, actarg);
-
- /* free saved data */
- for (i = 0; i < q->vcnt; i++)
- free(argv[i]);
- free(argv);
}
- sq_destroy(sq);
- return MR_SUCCESS;
+
+ return followup_fix_modby(q, sq, v, action, actarg, cl);
}
client *cl)
{
char **argv;
- int i, id, status;
+ int status;
while (sq_get_data(sq, &argv))
{
mr_trim_args(q->vcnt, argv);
- id = atoi(argv[4]);
- if (id > 0)
- status = id_to_name(id, USERS_TABLE, &argv[4]);
- else
- status = id_to_name(-id, STRINGS_TABLE, &argv[4]);
- if (status && status != MR_NO_MATCH)
- return status;
-
- id = atoi(argv[2]);
- if (!strcmp(argv[1], "LIST"))
- status = id_to_name(id, LIST_TABLE, &argv[2]);
- else if (!strcmp(argv[1], "USER"))
- status = id_to_name(id, USERS_TABLE, &argv[2]);
- else if (!strcmp(argv[1], "KERBEROS"))
- status = id_to_name(id, STRINGS_TABLE, &argv[2]);
- else if (!strcmp(argv[1], "NONE"))
- {
- status = 0;
- free(argv[2]);
- argv[2] = xstrdup("NONE");
- }
- else
- {
- status = 0;
- free(argv[2]);
- argv[2] = xstrdup("???");
- }
+ status = fix_ace(argv[1], &argv[2]);
if (status && status != MR_NO_MATCH)
return status;
-
- /* send the data */
- (*action)(q->vcnt, argv, actarg);
-
- /* free saved data */
- for (i = 0; i < q->vcnt; i++)
- free(argv[i]);
- free(argv);
}
- sq_destroy(sq);
- return MR_SUCCESS;
+
+ return followup_fix_modby(q, sq, v, action, actarg, cl);
}
return MR_SUCCESS;
}
}
+
+/* followup_gcon: fix the ace_name, memace_name, and modby */
+
+int followup_gcon(struct query *q, struct save_queue *sq, struct validate *v,
+ int (*action)(int, char *[], void *), void *actarg,
+ client *cl)
+{
+ char **argv;
+ int status, idx = 0;
+
+ if (q->version >= 9)
+ idx = 1;
+
+ while (sq_get_data(sq, &argv))
+ {
+ mr_trim_args(q->vcnt, argv);
+
+ status = fix_ace(argv[4 + idx], &argv[5 + idx]);
+ if (status && status != MR_NO_MATCH)
+ return status;
+
+ status = fix_ace(argv[6 + idx], &argv[7 + idx]);
+ if (status && status != MR_NO_MATCH)
+ return status;
+ }
+
+ return followup_fix_modby(q, sq, v, action, actarg, cl);
+}
+
+/* followup_get_user: fix the modby and creator.
+ * This assumes that the modby and creator fields are always
+ * in the same relative position in the argv.
+ */
+
+int followup_get_user(struct query *q, struct save_queue *sq, struct
+ validate *v, int (*action)(int, char *[], void *),
+ void *actarg, client *cl)
+{
+ char **argv;
+ int i, j, k, status, id;
+
+ i = q->vcnt - 4;
+ j = q->vcnt - 1;
+ while (sq_get_data(sq, &argv))
+ {
+ mr_trim_args(q->vcnt, argv);
+
+ id = atoi(argv[i]);
+ if (id > 0)
+ status = id_to_name(id, USERS_TABLE, &argv[i]);
+ else
+ status = id_to_name(-id, STRINGS_TABLE, &argv[i]);
+ if (status && status != MR_NO_MATCH)
+ return status;
+
+ id = atoi(argv[j]);
+ if (id > 0)
+ status = id_to_name(id, USERS_TABLE, &argv[j]);
+ else
+ status = id_to_name(-id, STRINGS_TABLE, &argv[j]);
+ if (status && status != MR_NO_MATCH)
+ return status;
+
+ if (q->version > 11)
+ {
+ status = fix_ace(argv[15], &argv[16]);
+ if (status && status != MR_NO_MATCH)
+ return status;
+ }
+
+ (*action)(q->vcnt, argv, actarg);
+ for (k = 0; k < q->vcnt; k++)
+ free(argv[k]);
+ free(argv);
+ }
+ sq_destroy(sq);
+ return MR_SUCCESS;
+}
andersk / moira.git / blobdiff