fixup delete_nfs_physical

[moira.git] / server / qrtn.dc

diff --git a/server/qrtn.dc b/server/qrtn.dc
index ebf3aac93f8741c356600e5e539444e2833b4538..f76e8df80a39ed9e499e0617457709d63ba4a51f 100644 (file)
--- a/server/qrtn.dc
+++ b/server/qrtn.dc
@@ -29,12 +29,13 @@ char cdummy[MR_CDUMMY_LEN];
 char stmt_buf[MR_STMTBUF_LEN];
 EXEC SQL END DECLARE SECTION; 
 
-char *Argv[16];
+char *Argv[QMAXARGS];
 
 int ingres_errno = 0;
 int mr_errcode = 0;
 EXEC SQL BEGIN DECLARE SECTION; 
 int query_timeout = 30;
+char *database = "moira";
 EXEC SQL END DECLARE SECTION;
 extern char *whoami;
 extern FILE *journal;
@@ -76,7 +77,9 @@ void ingerr()
        break;
 /* These should never come up unless someone breaks the query table */
       case INGRES_NO_CURSOR:
-       mr_errcode = MR_INTERNAL;
+       if (mr_errcode != MR_BUSY &&
+           mr_errcode != MR_DEADLOCK)
+         mr_errcode = MR_INTERNAL;
        com_err(whoami, 0, "Cursor not opened");
        break;
       case INGRES_NO_STMT:
@@ -129,7 +132,7 @@ int mr_open_database()
 
     /* open the database */
 #ifsql INGRES
-    EXEC SQL CONNECT moira;
+    EXEC SQL CONNECT :database;
     if(ingres_errno) 
       return (ingres_errno);
     EXEC SQL set lockmode session where level = table, timeout = :query_timeout;
@@ -508,6 +511,8 @@ build_sort(v, sort)
 
 /* Build arguement vector, verify query and arguments */
 
+int privileged;
+
 mr_verify_query(cl, q, argc, argv_ro)
     client *cl;
     struct query *q;
@@ -518,9 +523,10 @@ mr_verify_query(cl, q, argc, argv_ro)
     register int status;
     register struct validate *v = q->validate;
     register int i;
-    register int privileged = 0;
     register char *to,*fr,*stop;
 
+    privileged = 0;
+
     /* copy the arguments into a local argv that we can modify */
     if (argc >= QMAXARGS)
       return(MR_ARGS);
@@ -563,7 +569,7 @@ mr_verify_query(cl, q, argc, argv_ro)
        if (status != MR_SUCCESS && status != MR_PERM)
            return(status);
        if (status == MR_SUCCESS)
-           privileged++;
+           return(MR_SUCCESS);
     }
 
     return(privileged ? MR_SUCCESS : MR_PERM);