fixed header again - tom

[moira.git] / server / qrtn.dc

diff --git a/server/qrtn.dc b/server/qrtn.dc
index c3dc6e8a6e122e4a7691f50d2c24d1b6ad290010..154e4007da3376536334514912e91bc7d3edbda4 100644 (file)
--- a/server/qrtn.dc
+++ b/server/qrtn.dc
@@ -110,7 +110,6 @@ EXEC SQL WHENEVER SQLERROR CALL ingerr;
 int mr_open_database()
 {
     register int i;
-    char *malloc();
     MR_SQLDA_T *mr_alloc_SQLDA();
     static first_open = 1;
 
@@ -437,7 +436,6 @@ build_qual(fmt, argc, argv, qual)
     register char *c;
     register int i;
     char *args[4];
-    char *index();
 
     c = fmt;
     for (i = 0; i < argc; i++) {
@@ -491,6 +489,9 @@ build_sort(v, sort)
     register struct valobj *vo;
     register int n;
     char elem[16];
+#ifdef _DEBUG_MALLOC_INC
+#undef index
+#endif
 
     n = v->objcnt;
     vo = v->valobj;
@@ -511,6 +512,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;
@@ -521,9 +524,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);
@@ -566,7 +570,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);