Diane Delgado's changes for a fixed table-locking order

[moira.git] / gen / pobox.dc

diff --git a/gen/pobox.dc b/gen/pobox.dc
index c06087cbda245d58a65f596990172a3494739280..bba1e2ec09693416046349554070ed95db284da5 100644 (file)
--- a/gen/pobox.dc
+++ b/gen/pobox.dc
@@ -14,6 +14,7 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <ctype.h>
+#include <string.h>
 EXEC SQL INCLUDE sqlca;
 
 extern int errno;
@@ -99,6 +100,8 @@ char **argv;
                !strcasecmp(".local", string + i - 6)) {
                string[i-6] = 0;
                fprintf(out, "%s %s.mit.edu\n", id, string);
+           } else if ( !strchr(string, '@') ) {
+             fprintf(out, "%s %s@mit.edu\n", id, string);
            } else
              fprintf(out, "%s %s\n", id, string);
        }
@@ -123,6 +126,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);