Disable shutdowns completely.

[moira.git] / server / qrtn.qc

diff --git a/server/qrtn.qc b/server/qrtn.qc
index 2e4c8d34a1aaef9c13f154379d665dae983cf542..505ae17646c55047abe7f6bbd7834e82bb055d58 100644 (file)
--- a/server/qrtn.qc
+++ b/server/qrtn.qc
@@ -6,9 +6,18 @@
  *     Copyright (C) 1987 by the Massachusetts Institute of Technology
  *
  *     $Log$
- *     Revision 1.9  1987-08-22 17:47:38  wesommer
- *     Cleanup (these changes were by Mike).
+ *     Revision 1.11  1987-09-01 16:10:01  wesommer
+ *     This change was made by Mike, who didn't feel like checking it in.
+ *     Temp hack: ignore instances.
  *
+ * Revision 1.10  87/08/28  14:57:51  mike
+ * Modified sms_query to not enclose RETRIEVE queries in begin/end transaction.
+ * This was necessary to allow get_all_poboxes and get_groups_of_all_users
+ * to temporarily change the Ingres lockmode.
+ * 
+ * Revision 1.9  87/08/22  17:47:38  wesommer
+ * Cleanup (these changes were by Mike).
+ * 
  * Revision 1.8  87/08/10  16:22:26  mike
  * wesommer modified error reporting.
  * 
@@ -209,7 +218,8 @@ sms_process_query(cl, name, argc, argv_ro, action, actarg)
            return(status);
     }
 
-##  begin transaction
+    if (q->type != RETRIEVE)
+##      begin transaction
 
     switch (q->type) {
     case RETRIEVE:
@@ -343,10 +353,13 @@ sms_process_query(cl, name, argc, argv_ro, action, actarg)
 
     }
 
-    if (status == SMS_SUCCESS)
-##      end transaction
-    else
-##      abort
+    if (q->type != RETRIEVE) {
+        if (status == SMS_SUCCESS) {
+##          end transaction
+       } else {
+##          abort
+       }
+    }
 
     if (status != SMS_SUCCESS && log_flags & LOG_RES)
        com_err(whoami, status, " (Query failed)");
@@ -475,9 +488,8 @@ get_client(cl, client_type, client_id)
 ##  char *name;
 ##  int rowcount;
 
-    /* for now accept only null instances */
+    /* for now ignore instances */
     krb = &cl->kname;
-    if (krb->inst[0]) return(SMS_PERM);
 
     /* if client is from local realm, get users_id */
     if (!strcmp(krb->realm, krb_realm)) {