X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/0a7ae10eb16ca1a195e65f2fa8c92e006d867b77..564ed5a8e2cbe2868f33e0e28e55aaac1e047b8e:/server/qrtn.qc

diff --git a/server/qrtn.qc b/server/qrtn.qc
index c951d8cc..55559c62 100644
--- a/server/qrtn.qc
+++ b/server/qrtn.qc
@@ -4,6 +4,8 @@
  *	$Header$
  *
  *	Copyright (C) 1987, 1988 by the Massachusetts Institute of Technology
+ *	For copying and distribution information, please see the file
+ *	<mit-copyright.h>.
  * 
  */
 
@@ -11,18 +13,23 @@
 static char *rcsid_qrtn_qc = "$Header$";
 #endif lint
 
+#include <mit-copyright.h>
 #include "query.h"
-#include "sms_server.h"
+#include "mr_server.h"
 
 char *Argv[16];
 
-static int ingres_errno = 0;
+int ingres_errno = 0;
+int mr_errcode = 0;
+## int query_timeout = 30;
 extern char *whoami;
 extern FILE *journal;
 
 #define INGRES_BAD_INT 4111
 #define INGRES_BAD_DATE 4302
 #define INGRES_DEADLOCK 4700
+#define INGRES_TIMEOUT 4702
+#define INGRES_NO_RANGE 2109
 
 /*
  * ingerr: (supposedly) called when Ingres indicates an error.
@@ -33,51 +40,72 @@ extern FILE *journal;
 static int ingerr(num)
     int *num;
 {
-    char buf[256];
+    ingres_errno = *num;
 
     switch (*num) {
     case INGRES_BAD_INT:
-	ingres_errno = SMS_INTEGER;
+	mr_errcode = MR_INTEGER;
 	break;
     case INGRES_BAD_DATE:
-	ingres_errno = SMS_DATE;
+	mr_errcode = MR_DATE;
 	break;
     case INGRES_DEADLOCK:
-	ingres_errno = SMS_DEADLOCK;
+	mr_errcode = MR_DEADLOCK;
+	com_err(whoami, 0, "INGRES deadlock detected");
+	break;
+    case INGRES_TIMEOUT:
+	mr_errcode = MR_BUSY;
+	com_err(whoami, 0, "timed out getting lock");
+	break;
+    case INGRES_NO_RANGE:
+	mr_errcode = MR_INGRES_SOFTFAIL;
+	com_err(whoami, 0, "INGRES missing range statement");
 	break;
     default:
-	ingres_errno = SMS_INGRES_ERR;
-	com_err(whoami, SMS_INGRES_ERR, " code %d\n", *num);
-	critical_alert("SMS", "SMS server encountered INGRES ERROR %d", *num);
+	mr_errcode = MR_INGRES_ERR;
+	com_err(whoami, MR_INGRES_ERR, " code %d\n", *num);
+	critical_alert("MOIRA", "Moira server encountered INGRES ERROR %d", *num);
 	return (*num);
     }
     return (0);
 }
 
-int sms_open_database()
+int mr_open_database()
 {
     register int i;
     char *malloc();
+    static first_open = 1;
+
+    if (first_open) {
+	first_open = 0;
 
-    /* initialize local argv */
-    for (i = 0; i < 16; i++)
-	Argv[i] = malloc(ARGLEN);
+	/* initialize local argv */
+	for (i = 0; i < 16; i++)
+	  Argv[i] = malloc(ARGLEN);
 
-    IIseterr(ingerr);
+	IIseterr(ingerr);
+	incremental_init();
+	flush_cache();
+    }
 	
     ingres_errno = 0;
-	
+    mr_errcode = 0;
+
     /* open the database */
 ##  ingres sms
+##  set lockmode session where level = table, timeout = query_timeout
+##  set lockmode on capacls where readlock = shared
+##  set lockmode on alias where readlock = shared
     return ingres_errno;
 }
 
-int sms_close_database()
+int mr_close_database()
 {
+    flush_cache();
 ##  exit
 }
 
-sms_check_access(cl, name, argc, argv_ro)
+mr_check_access(cl, name, argc, argv_ro)
     client *cl;
     char *name;
     int argc;
@@ -86,14 +114,17 @@ sms_check_access(cl, name, argc, argv_ro)
     struct query *q;
     struct query *get_query_by_name();
 
-    q = get_query_by_name(name, cl->args->sms_version_no);
+    ingres_errno = 0;
+    mr_errcode = 0;
+
+    q = get_query_by_name(name, cl->args->mr_version_no);
     if (q == (struct query *)0)
-	return(SMS_NO_HANDLE);
+	return(MR_NO_HANDLE);
 
-    return(sms_verify_query(cl, q, argc, argv_ro));
+    return(mr_verify_query(cl, q, argc, argv_ro));
 }
 
-sms_process_query(cl, name, argc, argv_ro, action, actarg)
+mr_process_query(cl, name, argc, argv_ro, action, actarg)
     client *cl;
     char *name;
     int argc;
@@ -108,45 +139,49 @@ sms_process_query(cl, name, argc, argv_ro, action, actarg)
     char sort[32];
     char *pqual;
     char *psort;
-##  char *table;
+##  char *table, *rvar;
     struct save_queue *sq;
     struct query *get_query_by_name();
     int sq_save_args();
     struct save_queue *sq_create();
     char *build_sort();
 
+    ingres_errno = 0;
+    mr_errcode = 0;
+
     /* list queries command */
     if (!strcmp(name, "_list_queries")) {
-	list_queries(cl->args->sms_version_no, action, actarg);
-	return(SMS_SUCCESS);
+	list_queries(cl->args->mr_version_no, action, actarg);
+	return(MR_SUCCESS);
     }
 
     /* help query command */
     if (!strcmp(name, "_help")) {
 	if (argc < 1)
-	    return(SMS_ARGS);
-	q = get_query_by_name(argv_ro[0], cl->args->sms_version_no);
-	if (q == (struct query *)0) return(SMS_NO_HANDLE);
+	    return(MR_ARGS);
+	q = get_query_by_name(argv_ro[0], cl->args->mr_version_no);
+	if (q == (struct query *)0) return(MR_NO_HANDLE);
 	help_query(q, action, actarg);
-	return(SMS_SUCCESS);
+	return(MR_SUCCESS);
     }
 
     /* get query structure, return error if named query does not exist */
-    q = get_query_by_name(name, cl->args->sms_version_no);
-    if (q == (struct query *)0) return(SMS_NO_HANDLE);
+    q = get_query_by_name(name, cl->args->mr_version_no);
+    if (q == (struct query *)0) return(MR_NO_HANDLE);
     v = q->validate;
 
-    if (q->type != RETRIEVE)
+    if (q->type != RETRIEVE) {
 ##      begin transaction
+    }
 
     /* setup argument vector, verify access and arguments */
-    if ((status = sms_verify_query(cl, q, argc, argv_ro)) != SMS_SUCCESS)
+    if ((status = mr_verify_query(cl, q, argc, argv_ro)) != MR_SUCCESS)
 	goto out;
 
     /* perform any special query pre-processing */
     if (v && v->pre_rtn) {
 	status = (*v->pre_rtn)(q, Argv, cl, 0);
-	if (status != SMS_SUCCESS)
+	if (status != MR_SUCCESS)
 	    goto out;
     }
 
@@ -156,7 +191,7 @@ sms_process_query(cl, name, argc, argv_ro, action, actarg)
 	   uniquely exists */
 	if (v && v->field) {
 	    status = validate_row(q, Argv, v);
-	    if (status != SMS_EXISTS) break;
+	    if (status != MR_EXISTS) break;
 	}
 
 	/* build "where" clause if needed */
@@ -181,7 +216,7 @@ sms_process_query(cl, name, argc, argv_ro, action, actarg)
 	    if (v && v->post_rtn) {
 		sq = sq_create();
 		status = do_retrieve(q, pqual, psort, sq_save_args, sq);
-		if (status != SMS_SUCCESS) {
+		if (status != MR_SUCCESS) {
 		    sq_destroy(sq);
 		    break;
 		}
@@ -190,10 +225,7 @@ sms_process_query(cl, name, argc, argv_ro, action, actarg)
 		/* normal retrieve */
 		status = do_retrieve(q, pqual, psort, action, actarg);
 	    }
-	    if (status != SMS_SUCCESS) break;
-	    table = q->rtable;
-##          repeat replace tblstats (retrieves = tblstats.retrieves + 1)
-##                 where tblstats.#table = @table
+	    if (status != MR_SUCCESS) break;
 	} else {
 	    status = (*v->post_rtn)(q, Argv, cl, action, actarg);
 	}
@@ -204,15 +236,18 @@ sms_process_query(cl, name, argc, argv_ro, action, actarg)
 	/* see if row already exists */
 	if (v->field) {
 	    status = validate_row(q, Argv, v);
-	    if (status != SMS_EXISTS) break;
+	    if (status != MR_EXISTS) break;
 	}
 
 	/* build "where" clause and perform update */
 	/* if q->rvar = NULL, perform post_rtn only */
 	if (q->rvar) {
 	    build_qual(q->qual, q->argc, Argv, qual);
+	    incremental_before(q->rtable, qual, argv_ro);
 	    status = do_update(q, &Argv[q->argc], qual, action, actarg);
-	    if (status != SMS_SUCCESS) break;
+	    incremental_after(q->rtable, qual, argv_ro);
+	    if (status != MR_SUCCESS) break;
+	    flush_name(argv_ro[0], q->rtable);
 	    table = q->rtable;
 	    if (strcmp(q->shortname, "sshi") && strcmp(q->shortname, "ssif")) {
 ##		repeat replace tblstats (updates = tblstats.updates + 1,
@@ -230,13 +265,13 @@ sms_process_query(cl, name, argc, argv_ro, action, actarg)
 	/* see if row already exists */
 	if (v->field) {
 	    status = validate_row(q, Argv, v);
-	    if (status != SMS_NO_MATCH) break;
+	    if (status != MR_NO_MATCH) break;
 	}
 
 	/* increment id number if necessary */
 	if (v->object_id) {
 	    status = set_next_object_id(v->object_id, q->rtable);
-	    if (status != SMS_SUCCESS) break;
+	    if (status != MR_SUCCESS) break;
 	}
 
 	/* build "where" clause if needed */
@@ -250,8 +285,16 @@ sms_process_query(cl, name, argc, argv_ro, action, actarg)
 	/* perform the append */
 	/* if q->rvar = NULL, perform post_rtn only */
 	if (q->rvar) {
+	    incremental_clear_before();
 	    status = do_append(q, &Argv[q->argc], pqual, action, actarg);
-	    if (status != SMS_SUCCESS) break;
+	    if (status != MR_SUCCESS) break;
+	    if (v && v->object_id) {
+		sprintf(qual, "%s.%s = values.value and values.name = \"%s\"",
+			q->rvar, v->object_id, v->object_id);
+		incremental_after(q->rtable, qual, argv_ro);
+	    } else
+	      incremental_after(q->rtable, pqual, argv_ro);
+
 	    table = q->rtable;
 ##	    repeat replace tblstats (appends = tblstats.appends + 1,
 ##				     modtime = "now")
@@ -266,16 +309,21 @@ sms_process_query(cl, name, argc, argv_ro, action, actarg)
 	/* see if row already exists */
 	if (v->field) {
 	    status = validate_row(q, Argv, v);
-	    if (status != SMS_EXISTS) break;
+	    if (status != MR_EXISTS) break;
 	}
 
 	/* build "where" clause and perform delete */
 	/* if q->rvar = NULL, perform post_rtn only */
 	if (q->rvar) {
 	    build_qual(q->qual, q->argc, Argv, qual);
-	    status = do_delete(q, qual, action, actarg);
-	    if (status != SMS_SUCCESS) break;
 	    table = q->rtable;
+	    rvar = q->rvar;
+##	    range of rvar is table
+	    incremental_before(q->rtable, qual, argv_ro);
+	    status = do_delete(q, qual, action, actarg);
+	    incremental_clear_after();
+	    if (status != MR_SUCCESS) break;
+	    flush_name(argv_ro[0], q->rtable);
 ##	    repeat replace tblstats (deletes = tblstats.deletes + 1,
 ##				     modtime = "now")
 ##		where tblstats.#table = @table
@@ -288,8 +336,14 @@ sms_process_query(cl, name, argc, argv_ro, action, actarg)
     }
 
 out:
+    if (status == MR_SUCCESS && ingres_errno != 0) {
+	com_err(whoami, MR_INTERNAL, "Server didn't notice INGRES ERROR %d",
+		       ingres_errno);
+	status = mr_errcode;
+    }
+
     if (q->type != RETRIEVE) {
-        if (status == SMS_SUCCESS) {
+        if (status == MR_SUCCESS) {
 ##          end transaction	/* commit to this */
 	    if (journal) {
 		char buf[1024], *bp;
@@ -298,7 +352,7 @@ out:
 
 		fprintf(journal, "%% %s %s %s",
 			cl->clname, cl->entity, ctime(&now));
-		fprintf(journal, "%s[%d] ", q->name, cl->args->sms_version_no);
+		fprintf(journal, "%s[%d] ", q->name, cl->args->mr_version_no);
 		for (i = 0; i < argc; i++) {
 		    if (i != 0) {
 			putc(' ', journal);
@@ -309,12 +363,17 @@ out:
 		putc('\n', journal);
 		fflush(journal);
 	    }
+	    incremental_update();
 	} else {
-##          abort		/* it never happened */
+	    if (ingres_errno != INGRES_DEADLOCK) {
+##          	abort		/* it never happened */
+	    }
+	    incremental_flush();
 	}
+##      set lockmode session where readlock = system
     }
 
-    if (status != SMS_SUCCESS && log_flags & LOG_RES)
+    if (status != MR_SUCCESS && log_flags & LOG_RES)
 	com_err(whoami, status, " (Query failed)");
     return(status);
 }
@@ -333,13 +392,13 @@ build_qual(fmt, argc, argv, qual)
     c = fmt;
     for (i = 0; i < argc; i++) {
 	c = index(c, '%');
-	if (c++ == (char *)0) return(SMS_ARGS);
+	if (c++ == (char *)0) return(MR_ARGS);
 	if (*c == 's')
 	    args[i] = argv[i];
 	else if (*c == 'd')
 	    *(int *)&args[i] = *(int *)argv[i];	/* sigh */
 	else
-	    return(SMS_INGRES_ERR);
+	    return(MR_INGRES_ERR);
     }
 
     switch (argc) {
@@ -363,7 +422,7 @@ build_qual(fmt, argc, argv, qual)
 	sprintf(qual, fmt, args[0], args[1], args[2], args[3]);
 	break;
     }
-    return(SMS_SUCCESS);
+    return(MR_SUCCESS);
 }
 
 char *
@@ -394,7 +453,7 @@ build_sort(v, sort)
 
 /* Build arguement vector, verify query and arguments */
 
-sms_verify_query(cl, q, argc, argv_ro)
+mr_verify_query(cl, q, argc, argv_ro)
     client *cl;
     struct query *q;
     int argc;
@@ -405,45 +464,55 @@ sms_verify_query(cl, q, argc, argv_ro)
     register struct validate *v = q->validate;
     register int i;
     register int privileged = 0;
+    int len;
 
     /* copy the arguments into a local argv that we can modify */
+    if (argc >= QMAXARGS)
+      return(MR_ARGS);
     for (i = 0; i < argc; i++) {
-	if (strlen(argv_ro[i]) < ARGLEN)
+	if ((len = strlen(argv_ro[i])) < ARGLEN)
 	    strcpy(Argv[i], argv_ro[i]);
 	else
-	    return(SMS_ARG_TOO_LONG);
+	    return(MR_ARG_TOO_LONG);
+	if (Argv[i][len-1] == '\\')
+	  return(MR_BAD_CHAR);
     }
 
     /* check initial query access */
     status = check_query_access(q, Argv, cl);
-    if (status != SMS_SUCCESS && status != SMS_PERM)
+    if (status != MR_SUCCESS && status != MR_PERM)
 	return(status);
-    if (status == SMS_SUCCESS)
+    if (status == MR_SUCCESS)
 	privileged++;
 
     /* check argument count */
     argreq = q->argc;
     if (q->type == UPDATE || q->type == APPEND) argreq += q->vcnt;
-    if (argc != argreq) return(SMS_ARGS);
+    if (argc != argreq) return(MR_ARGS);
 
     /* validate arguments */
     if (v && v->valobj) {
 	status = validate_fields(q, Argv, v->valobj, v->objcnt);
-	if (status != SMS_SUCCESS) return(status);
+	if (status != MR_SUCCESS) return(status);
     }
 
     /* perform special query access check */
     if (!privileged && v && v->acs_rtn) {
 	status = (*v->acs_rtn)(q, Argv, cl);
-	if (status != SMS_SUCCESS && status != SMS_PERM)
+	if (status != MR_SUCCESS && status != MR_PERM)
 	    return(status);
-	if (status == SMS_SUCCESS)
+	if (status == MR_SUCCESS)
 	    privileged++;
     }
 
-    return(privileged ? SMS_SUCCESS : SMS_PERM);
+    return(privileged ? MR_SUCCESS : MR_PERM);
 }
 
+
+/* This routine caches info from the database.  Each query acl is stored
+ * in the query structure, and whether that acl contains everybody.
+ */
+
 check_query_access(q, argv, cl)
     struct query *q;
     char *argv[];
@@ -459,124 +528,84 @@ check_query_access(q, argv, cl)
     int client_id;
     char *client_type;
 
-    /* get query access control list */
-    name = q->shortname;
-##  repeat retrieve (acl_id = capacls.list_id) where capacls.tag = @name
-##  inquire_equel (rowcount = "rowcount", errorno = "errorno")
-    if (errorno != 0) return(SMS_INGRES_ERR);
-    if (rowcount == 0) return(SMS_PERM);
-
     /* initialize default uid */
     if (def_uid == 0) {
 ##	retrieve (def_uid = users.users_id) where users.login = "default"
     }
 
-    /* check for default access */
-##  range of m is members
-##  repeat retrieve (exists = any(m.#member_id where m.list_id = @acl_id and
-##                   m.member_type = "USER" and m.#member_id = def_uid))
-    if (exists) return(SMS_SUCCESS);
+    /* get query access control list */
+    if (q->acl != 0)
+      acl_id = q->acl;
+    else {
+	name = q->shortname;
+##	retrieve (acl_id = capacls.list_id) where capacls.tag = name
+##	inquire_equel (rowcount = "rowcount", errorno = "errorno")
+	if (errorno != 0) return(MR_INGRES_ERR);
+	if (rowcount == 0) return(MR_PERM);
+	q->acl = acl_id;
+
+	/* check for default access */
+##	retrieve (exists = any(imembers.#member_id where
+##			       imembers.list_id = acl_id and
+##			       imembers.member_type = "USER" and
+##			       imembers.#member_id = def_uid))
+	q->everybody = exists;
+    }
 
-    /* parse client name */
-    status = get_client(cl, &client_type, &client_id);
-    if (status != SMS_SUCCESS) return(status);
+    if (q->everybody)
+      return(MR_SUCCESS);
 
-    /* see if client is in the list (or any of its sub-lists) */
-    exists = find_member("LIST", acl_id, client_type, client_id, 0);
-    return ((exists) ? SMS_SUCCESS : SMS_PERM);
+    if (get_client(cl, &client_type, &client_id) != MR_SUCCESS)
+      return(MR_PERM);
+    if (find_member("LIST", acl_id, client_type, client_id, 0))
+      return(MR_SUCCESS);
+    else
+      return(MR_PERM);
 ##}
 
+
 get_client(cl, client_type, client_id)
     client *cl;
     char **client_type;
     int *client_id;
-##{
-    struct krbname *krb;
-##  int member_id;
-##  char *name;
-##  int rowcount;
-
-    if (cl->clname == NULL)
-	return SMS_PERM;
-    
-    /* for now ignore instances */
-    krb = &cl->kname;
-
-    /* if client is from local realm, get users_id */
-    if (!strcmp(krb->realm, krb_realm)) {
+{
+    if (cl->users_id > 0) {
 	*client_id = cl->users_id;
 	*client_type = "USER";
-	return(SMS_SUCCESS);
+	return(MR_SUCCESS);
     }
 
-    /* otherwise use string_id */
-    name = cl->clname;
-##  repeat retrieve (member_id = strings.string_id) 
-##      where strings.string = @name
-	
-    /* make sure we found a users or string id */
-##  inquire_equel (rowcount = "rowcount")
-    if (rowcount == 0) return(SMS_PERM);
+    if (cl->client_id < 0) {
+	*client_id = -cl->users_id;
+	*client_type = "KERBEROS";
+	return(MR_SUCCESS);
+    }
 
-    *client_type = "STRING";
-    *client_id = member_id;
-    return(SMS_SUCCESS);
-##}
+    return(MR_PERM);
+}
 
-##find_member(list_type, list_id, member_type, member_id, sq)
+##find_member(list_type, list_id, member_type, member_id)
     char *list_type;
 ##  int list_id;
 ##  char *member_type;
 ##  int member_id;
-    struct save_queue *sq;
 ##{
-##  int exists;
-##  int sublist;
-    int child;
-    struct save_queue *sq_create();
+##  int exists, errorno;
 
-    /* see if client is a direct member of list */
-##  repeat retrieve (exists = any(m.#member_id where 
-##				  m.#list_id = @list_id and
-##				  m.#member_type = @member_type and 
-##				  m.#member_id = @member_id))
-    if (exists) return(1);
-
-    /* are there any sub-lists? */
-##  repeat retrieve (exists = any(m.#member_id where m.#list_id = @list_id and
-##                   m.#member_type = "LIST"))
-    if (!exists) return(0);
-
-    /* yes; now recurse through sublists */
-
-    /* create a save queue */
-    if (sq == (struct save_queue *)0) {
-	sq = sq_create();
-	child = 0;
-    } else {
-	child = 1;
-    }
+    if (!strcmp(strtrim(list_type), strtrim(member_type)) &&
+	list_id == member_id)
+	return(1);
 
-    /* save all sublist ids */
-##  range of m is members
-##  retrieve (sublist = m.#member_id) 
-##      where m.#list_id = list_id and m.#member_type = "LIST"
-##  {
-	 sq_save_unique_data(sq, sublist);
-##  }
-
-    if (child) return(0);
-
-    /* at top-level, check sub-lists for client (breadth-first search) */
-    while (sq_get_data(sq, &sublist)) {
-	exists = find_member(list_type, sublist, member_type, member_id, sq);
-	if (exists) {
-	    sq_destroy(sq);
-	    return(1);
-	}
-    }
-    sq_destroy(sq);
-    return(0);
+    /* see if client is a direct member of list */
+##  repeat retrieve (exists = any(imembers.#member_id where 
+##				  imembers.#list_id = @list_id and
+##				  imembers.#member_type = @member_type and 
+##				  imembers.#member_id = @member_id))
+##  inquire_equel(errorno = "errorno")
+    if (errorno == 0)
+      return(exists);
+    else
+      return(0);
 ##}
 
 
@@ -599,12 +628,12 @@ do_retrieve(q, pqual, psort, action, actarg)
 	register int i;
 
 	if ((vaddrs = (char **)malloc(sizeof(char *) * QMAXARGS)) == NULL) {
-	    com_err(whoami, SMS_NO_MEM, "setting up static argv");
+	    com_err(whoami, MR_NO_MEM, "setting up static argv");
 	    exit(1);
 	}
 	for (i = 0; i < QMAXARGS; i++) {
 	    if ((vaddrs[i] = malloc(QMAXARGSIZE)) == NULL) {
-		com_err(whoami, SMS_NO_MEM, "setting up static argv");
+		com_err(whoami, MR_NO_MEM, "setting up static argv");
 		exit(1);
 	    }
 	}
@@ -648,9 +677,9 @@ do_retrieve(q, pqual, psort, action, actarg)
 	}
     }
 
-##  inquire_equel (rowcount = "rowcount", errorno = "errorno")
-    if (errorno != 0) return(SMS_INGRES_ERR);
-    return ((rowcount == 0) ? SMS_NO_MATCH : SMS_SUCCESS);
+    if (mr_errcode) return(mr_errcode);
+##  inquire_equel (rowcount = "rowcount")
+    return ((rowcount == 0) ? MR_NO_MATCH : MR_SUCCESS);
 ##}
 
 do_update(q, argv, qual, action, actarg)
@@ -673,12 +702,8 @@ do_update(q, argv, qual, action, actarg)
 ##  replace rvar (param (q->tlist, argv))
 ##  where cqual
 
-##  inquire_equel (errorno = "errorno")
-    if (errorno == INGRES_BAD_INT)
-	return(SMS_INTEGER);
-    else if (errorno != 0)
-	return(SMS_INGRES_ERR);
-    return(SMS_SUCCESS);
+    if (mr_errcode) return(mr_errcode);
+    return(MR_SUCCESS);
 ##}
 
 do_append(q, argv, pqual, action, actarg)
@@ -704,12 +729,8 @@ do_append(q, argv, pqual, action, actarg)
 ##      append to rtable (param (q->tlist, argv))
     }
 
-##  inquire_equel (errorno = "errorno")
-    if (errorno == INGRES_BAD_INT)
-	return(SMS_INTEGER);
-    else if (errorno != 0)
-	return(SMS_INGRES_ERR);
-    return(SMS_SUCCESS);
+    if (mr_errcode) return(mr_errcode);
+    return(MR_SUCCESS);
 ##}
 
 do_delete(q, qual, action, actarg)
@@ -730,9 +751,8 @@ do_delete(q, qual, action, actarg)
     cqual = qual;
 ##  delete rvar where cqual
 
-##  inquire_equel (errorno = "errorno")
-    if (errorno != 0) return(SMS_INGRES_ERR);
-    return(SMS_SUCCESS);
+    if (mr_errcode) return(mr_errcode);
+    return(MR_SUCCESS);
 ##}
 
 
@@ -756,16 +776,15 @@ set_next_object_id(object, table)
 
     name = object;
     tbl = table;
-##  range of v is values
-##  repeat retrieve (value = v.#value) where v.#name = @name
+##  repeat retrieve (value = values.#value) where values.#name = @name
 ##  inquire_equel(rowcount = "rowcount")
     if (rowcount != 1)
-	return(SMS_NO_ID);
+	return(MR_NO_ID);
 
 ##  retrieve (exists = any(tbl.name where tbl.name = value))
 ##  inquire_equel(rowcount = "rowcount")
     if (rowcount != 1)
-	return(SMS_NO_ID);
+	return(MR_NO_ID);
     while (exists) {
 	value++;
 	if (value > MAX_ID_VALUE)
@@ -775,8 +794,55 @@ set_next_object_id(object, table)
 
     if (LOG_RES)
         com_err(whoami, 0, "setting ID %s to %d", name, value);
-##  repeat replace v (#value = @value) where v.#name = @name
-    return(SMS_SUCCESS);
+##  repeat replace values (#value = @value) where values.#name = @name
+    return(MR_SUCCESS);
+##}
+
+
+/* Turn a kerberos name into the user's ID of the account that principal
+ * owns.  Sets the kerberos ID and user ID.
+ */
+
+int set_krb_mapping(name, login, ok, kid, uid)
+char *name;
+char *login;
+int ok;
+int *kid;
+int *uid;
+##{
+##  int u_id, k_id, rowcount;
+##  char *krbname;
+
+    krbname = name;
+    *kid = 0;
+    *uid = 0;
+
+##  repeat retrieve (u_id = krbmap.#users_id, k_id = krbmap.#string_id)
+##	where krbmap.string_id = strings.string_id and strings.string = @krbname
+##  inquire_equel (rowcount = "rowcount")
+    if (ingres_errno) return(mr_errcode);
+    
+    if (rowcount == 1) {
+	*kid = -k_id;
+	*uid = u_id;
+	return(MR_SUCCESS);
+    }
+
+    if (name_to_id(name, "STRINGS", &k_id) == MR_SUCCESS)
+      *kid = -k_id;
+
+    if (!ok) {
+	*uid = *kid;
+	return(MR_SUCCESS);
+    }
+
+    if (name_to_id(login, "USERS", uid) != MR_SUCCESS)
+      *uid = 0;
+
+    if (*kid == 0)
+      *kid = *uid;
+    if (ingres_errno) return(mr_errcode);
+    return(MR_SUCCESS);
 ##}
 
 
@@ -788,14 +854,22 @@ sanity_check_queries()
 {
     register int i;
     int maxv = 0, maxa = 0;
+#ifdef MULTIPROTOCOLS
     extern int QueryCount1, QueryCount2;
     extern struct query Queries1[], Queries2[];
+#else
+    extern int QueryCount2;
+    extern struct query Queries2[];
+#endif MULTIPROTOCOLS
+
 #define MAX(x,y) ((x) > (y) ? (x) : (y))
 
+#ifdef MULTIPROTOCOLS
     for (i = 0; i < QueryCount1; i++) {
 	maxv = MAX(maxv, Queries1[i].vcnt);
 	maxa = MAX(maxa, Queries1[i].argc);
     }
+#endif MULTIPROTOCOLS
     for (i = 0; i < QueryCount2; i++) {
 	maxv = MAX(maxv, Queries2[i].vcnt);
 	maxa = MAX(maxa, Queries2[i].argc);
@@ -805,16 +879,3 @@ sanity_check_queries()
 	exit(1);
     }
 }
-
-
-/*
- * Local Variables:
- * mode: c
- * c-indent-level: 4
- * c-continued-statement-offset: 4
- * c-brace-offset: -4
- * c-argdecl-indent: 4
- * c-label-offset: -4
- * End:
- */
-