add deadlock detection

[moira.git] / gen / pobox.dc

diff --git a/gen/pobox.dc b/gen/pobox.dc
index 2be2e2a3530449ee451ba447dc7cdb7f49defd1b..f0fd135a6d338dc6edfa6e8936af5ead6ce820d1 100644 (file)
--- a/gen/pobox.dc
+++ b/gen/pobox.dc
@@ -79,7 +79,7 @@ char **argv;
        strtrim(login);
        strtrim(id);
        if (isdigit(id[0]))
-         fprintf(out, "%s %s@ATHENA.MIT.EDU\n", id, login);
+         fprintf(out, "%s %s@MIT.EDU\n", id, login);
     }
 
     EXEC SQL CLOSE x;
@@ -123,6 +123,10 @@ char **argv;
 
  sqlerr:
     com_err(whoami, MR_INGRES_ERR, " code %d\n", sqlca.sqlcode);
+#ifsql INGRES
+    if (sqlca.sqlcode == 17700 || sqlca.sqlcode == -37000)
+      exit(MR_DEADLOCK);
+#endsql
     critical_alert("DCM", "Pobox build encountered INGRES ERROR %d",
                   sqlca.sqlcode);
     exit(MR_INGRES_ERR);