Installed ingres error & deadlock detection

diff --git a/gen/passwd.dc b/gen/passwd.dc
index 4964a55421011af6ba5b337e70506289e60b4479..c3984dab024ba7f21e54875ab86460b59e99271d 100644 (file)
--- a/gen/passwd.dc
+++ b/gen/passwd.dc
@@ -12,6 +12,7 @@
 
 extern int errno;
 char *ingres_date_and_time();
+char *whoami = "passwd.gen";
 
 
 main(argc, argv)
@@ -23,7 +24,9 @@ char **argv;
     struct stat sb;
 ##  char login[9], shell[33], fullname[33], oa[17], op[13], hp[17], *filetime;
 ##  int uid, error, flag;
+    int ingerr();
 
+    IIseterr(ingerr);
 ##  ingres sms
 
     if (argc == 2) {
@@ -82,3 +85,29 @@ char **argv;
       fix_file(outf);
     exit(SMS_SUCCESS);
 }
+
+
+/*
+ * ingerr: (supposedly) called when Ingres indicates an error.
+ * I have not yet been able to get this to work to intercept a
+ * database open error.
+ */
+#define INGRES_DEADLOCK 4700
+
+static int ingerr(num)
+    int *num;
+{
+    char buf[256];
+    int ingres_errno;
+
+    switch (*num) {
+    case INGRES_DEADLOCK:
+       ingres_errno = SMS_DEADLOCK;
+       break;
+    default:
+       ingres_errno = SMS_INGRES_ERR;
+    }
+    com_err(whoami, SMS_INGRES_ERR, " code %d\n", *num);
+    critical_alert("DCM", "Passwd build encountered INGRES ERROR %d", *num);
+    exit(ingres_errno);
+}