Expanded name and description fields for the subnet table

[moira.git] / gen / sis.dc

diff --git a/gen/sis.dc b/gen/sis.dc
index 284b2c7fc6a8bf05f9f8a51fa2b6b406bdbbce73..987612d91bb1703f1a37b38cebbe39042f1a8a15 100644 (file)
--- a/gen/sis.dc
+++ b/gen/sis.dc
@@ -49,10 +49,11 @@ char **argv;
     initialize_sms_error_table ();
 
 #ifsql INGRES
-    EXEC SQL CONNECT sms;
+    EXEC SQL CONNECT moira;
+    EXEC SQL SET LOCKMODE SESSION WHERE LEVEL=TABLE, READLOCK=SHARED;
 #endsql
 #ifsql INFORMIX
-    EXEC SQL DATABASE sms;
+    EXEC SQL DATABASE moira;
 #endsql
 
     if (argc == 2) {
@@ -81,10 +82,14 @@ char **argv;
     gettimeofday(&now, NULL);
     cutoff = now.tv_sec - 14 * 24 * 60 * 60;
 
+    /* The following is declarative, not executed,
+     * and so is dependent on where it is in the file,
+     * not in the order of execution of statements.
+     */
     EXEC SQL WHENEVER SQLERROR GOTO sqlerr;
 
     EXEC SQL DECLARE x CURSOR FOR
-      SELECT u.login, u.mit_id, u.signature, u.sigdate, s.string
+      SELECT u.login, u.clearid, u.signature, u.sigdate, s.string
       FROM users u, strings s
        WHERE u.status = 1 and u.sigwho = s.string_id and u.sigwho != 0
          and u.secure <= :cutoff and u.secure != 0;
@@ -102,7 +107,7 @@ char **argv;
        si.timestamp = timestamp;
        si.SigInfoVersion = 0; /* XXXXXX this isn't used */
        kname_parse(si.pname, si.pinst, si.prealm, kname);
-       si.rawsig = sig;
+       si.rawsig = (unsigned char *)sig;
        GDSS_Recompose(&si, outrec.sig);
        write(out, &outrec, sizeof(outrec));
     }
@@ -126,7 +131,7 @@ char **argv;
  sqlerr:
     com_err(whoami, MR_INGRES_ERR, " code %d\n", sqlca.sqlcode);
 #ifsql INGRES
-    if (sqlca.sqlcode == 17700)
+    if (sqlca.sqlcode == 17700 || sqlca.sqlcode == -37000)
       exit(MR_DEADLOCK);
 #endsql
     critical_alert("DCM", "SIS build encountered INGRES ERROR %d",