New database and column names for Moira2.

[moira.git] / gen / nfs.dc

diff --git a/gen/nfs.dc b/gen/nfs.dc
index 796a0d6dab17f2208463c0e272b2b0ab95bd0f81..fb2c915b3a5beb5d673f984489e017a5abdb47b4 100644 (file)
--- a/gen/nfs.dc
+++ b/gen/nfs.dc
@@ -40,10 +40,10 @@ char **argv;
     sprintf(nfs_dir, "%s/nfs", DCM_DIR);
 
 #ifsql INGRES
-    EXEC SQL CONNECT sms;
+    EXEC SQL CONNECT moira;
 #endsql
 #ifsql INFORMIX
-    EXEC SQL DATABASE sms;
+    EXEC SQL DATABASE moira;
 #endsql
 
     changed = do_nfs();
@@ -85,6 +85,10 @@ int do_nfs()
     machs = sq_create();
     lists = sq_create();
 
+    /* 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 s_cursor CURSOR FOR
       SELECT m.name, s.value3
@@ -172,7 +176,7 @@ struct save_queue *lists;
              fprintf(fd, "%s\n", u);
        }
        EXEC SQL CLOSE m_cursor;
-       if (fclose(fd)) {
+       if (fclose(fd) == EOF) {
            fprintf(stderr, "error closing %s\n", file);
            exit(MR_CCONFIG);
        }
@@ -231,7 +235,7 @@ struct hash *do_everyone()
     EXEC SQL DECLARE l_cursor CURSOR FOR
      SELECT gid, list_id
      FROM list
-     WHERE grp <> 0 AND active != 0;
+     WHERE grouplist != 0 AND active != 0;
     EXEC SQL OPEN l_cursor;
     while (1) {
         EXEC SQL FETCH l_cursor INTO :gid, :lid;
@@ -380,7 +384,7 @@ struct save_queue *machs;
     EXEC SQL CLOSE q_cursor;
     if (quotasum)
       fprintf(fd, "%d %d\n", prevuid, quotasum);
-    if (fd != stdin && fclose(fd)) {
+    if (fd != stdin && fclose(fd) == EOF) {
        fprintf(stderr, "error closing %s", file);
        exit(MR_CCONFIG);
       }
@@ -425,7 +429,7 @@ struct save_queue *machs;
     EXEC SQL CLOSE q_cursor2;
     if (quotasum)
       fprintf(fd, "%d %d\n", prevuid, quotasum);
-    if (fd != stdin && fclose(fd)) {
+    if (fd != stdin && fclose(fd) == EOF) {
        fprintf(stderr, "error closing %s", file);
        exit(MR_CCONFIG);
       }
@@ -463,7 +467,7 @@ struct save_queue *machs;
        fprintf(fd, "%s %d %d %s\n", strtrim(dir), uid, gid, strtrim(fstype));
     }    
     EXEC SQL CLOSE q_cursor3;
-    if (fclose(fd)) {
+    if (fclose(fd) == EOF) {
        fprintf(stderr, "error closing %s", file);
        exit(MR_CCONFIG);
     }