Build shared libmoira via libtool.

[moira.git] / server / qrtn.pc

diff --git a/server/qrtn.pc b/server/qrtn.pc
index a7c0ddf61f5070dec80fa668f58959d5a23cd672..cf95e434741f8a13c5aedc4af8b6b03bc2684955 100644 (file)
--- a/server/qrtn.pc
+++ b/server/qrtn.pc
@@ -78,7 +78,7 @@ void dbmserr(void)
   sqlglm(err_msg, &bufsize, &msglength);
   err_msg[msglength] = 0;
   com_err(whoami, 0, "SQL error text = %s", err_msg);
-  critical_alert("MOIRA", "Moira server encountered DBMS ERROR %d\n%s",
+  critical_alert(whoami, "MOIRA", "Moira server encountered DBMS ERROR %d\n%s",
                 dbms_errno, err_msg);
 }
 
@@ -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;
@@ -559,9 +559,6 @@ int mr_verify_query(client *cl, struct query *q, int argc, char *argv_ro[])
       if (*fr)
        return MR_ARG_TOO_LONG;
       *to = '\0';
-
-      if (to > Argv[i] && *--to == '\\')
-       return MR_BAD_CHAR;
     }
 
   /* Check initial query access.  If we're acting as a proxy, only allow
@@ -760,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
  **
  **/
@@ -955,7 +952,7 @@ int do_for_all_rows(char *query, int count,
     return mr_errcode;
   if (rowcount == max_row_count)
     {
-      critical_alert("moirad", "attempted query with too many rows");
+      critical_alert(whoami, "moirad", "attempted query with too many rows");
       return MR_NO_MEM;
     }
   else if (rowcount == 0)