Active account means status == 1, not status != 0; Punt lock detection

[moira.git] / server / qrtn.qc

diff --git a/server/qrtn.qc b/server/qrtn.qc
index c7849e304bcc3dade9f51e7c8159d87656cd1162..319b1b117199a63189cd5cef5b9778c83655c2d4 100644 (file)
--- a/server/qrtn.qc
+++ b/server/qrtn.qc
@@ -22,6 +22,7 @@ extern FILE *journal;
 
 #define INGRES_BAD_INT 4111
 #define INGRES_BAD_DATE 4302
+#define INGRES_DEADLOCK 4700
 
 /*
  * ingerr: (supposedly) called when Ingres indicates an error.
@@ -41,6 +42,9 @@ static int ingerr(num)
     case INGRES_BAD_DATE:
        ingres_errno = SMS_DATE;
        break;
+    case INGRES_DEADLOCK:
+       ingres_errno = SMS_DEADLOCK;
+       break;
     default:
        ingres_errno = SMS_INGRES_ERR;
        com_err(whoami, SMS_INGRES_ERR, " code %d\n", *num);
@@ -669,7 +673,7 @@ do_update(q, argv, qual, action, actarg)
 ##  where cqual
 
 ##  inquire_equel (errorno = "errorno")
-    if (errorno == 4111)
+    if (errorno == INGRES_BAD_INT)
        return(SMS_INTEGER);
     else if (errorno != 0)
        return(SMS_INGRES_ERR);