X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/962364ec44cc373026f65237d510443c4c9bb128..3adf4b2f0bdeeb5773607d707b7816983f93168e:/server/increment.dc

diff --git a/server/increment.dc b/server/increment.dc
index ec994fb3..c81361a6 100644
--- a/server/increment.dc
+++ b/server/increment.dc
@@ -21,7 +21,6 @@ static char *rcsid_increment_dc = "$Header$";
 EXEC SQL INCLUDE sqlca;
 
 extern char *whoami;
-char *malloc();
 
 int inc_pid = 0;
 int inc_running = 0;
@@ -133,7 +132,7 @@ char **argv;
 	  FROM users u WHERE :qual;
 	beforec = 9;
     } else if (!strcmp(table, "machine")) {
-	EXEC SQL SELECT m.name, m.type INTO :barg0, :barg1 FROM machine m
+	EXEC SQL SELECT m.name, m.vendor INTO :barg0, :barg1 FROM machine m
 	  WHERE :qual;
 	beforec = 2;
     } else if (!strcmp(table, "cluster")) {
@@ -188,15 +187,21 @@ char **argv;
 	beforec = 10;
     } else if (!strcmp(table, "members")) {
 	id = (int) argv[0];
-	EXEC SQL SELECT CHAR(grouplist) INTO :barg3 FROM list 
-	  WHERE list_id = :id;
+ 	EXEC SQL SELECT CHAR(active), CHAR(publicflg), CHAR(hidden),
+		CHAR(maillist), CHAR(grouplist), CHAR(gid)
+		INTO :barg3, :barg4, :barg5, :barg6, :barg7, :barg8
+		FROM list WHERE list_id = :id;
 	name = malloc(0);
 	id_to_name(id, "LIST", &name);
 	strcpy(barg0, name);
 	strcpy(barg1, argv[1]);
 	id = (int) argv[2];
+	beforec = 9;
 	if (!strcmp(barg1, "USER")) {
 	    id_to_name(id, barg1, &name);
+	    EXEC SQL SELECT CHAR(status) INTO :barg9 FROM users 
+		WHERE users_id=:id;
+	    beforec = 10;
 	} else if (!strcmp(barg1, "LIST")) {
 	    id_to_name(id, barg1, &name);
 	} else if (!strcmp(barg1, "STRING")) {
@@ -206,7 +211,6 @@ char **argv;
 	}
 	strcpy(barg2, name);
 	free(name);
-	beforec = 4;
     } /* else
       com_err(whoami, 0, "unknown table in incremental_before"); */
 }
@@ -246,7 +250,7 @@ EXEC SQL END DECLARE SECTION;
 	  FROM users u WHERE :qual;
 	afterc = 9;
     } else if (!strcmp(table, "machine")) {
-	EXEC SQL SELECT m.name, m.type INTO :aarg0, :aarg1
+	EXEC SQL SELECT m.name, m.vendor INTO :aarg0, :aarg1
 	  FROM machine m WHERE :qual;
 	afterc = 2;
     } else if (!strcmp(table, "cluster")) {
@@ -302,15 +306,21 @@ EXEC SQL END DECLARE SECTION;
 	afterc = 10;
     } else if (!strcmp(table, "members")) {
 	id = (int) argv[0];
-	EXEC SQL SELECT CHAR(grouplist) INTO :aarg3 FROM list
-	  WHERE list_id = :id;
+ 	EXEC SQL SELECT CHAR(active), CHAR(publicflg), CHAR(hidden),
+		CHAR(maillist), CHAR(grouplist), CHAR(gid)
+		INTO :aarg3, :aarg4, :aarg5, :aarg6, :aarg7, :aarg8
+		FROM list WHERE list_id = :id;
 	name = malloc(0);
 	id_to_name(id, "LIST", &name);
 	strcpy(aarg0, name);
 	strcpy(aarg1, argv[1]);
 	id = (int) argv[2];
+	afterc = 9;
 	if (!strcmp(aarg1, "USER")) {
 	    id_to_name(id, aarg1, &name);
+	    EXEC SQL SELECT CHAR(status) INTO :aarg9 FROM users 
+		WHERE users_id=:id;
+	    afterc = 10;
 	} else if (!strcmp(aarg1, "LIST")) {
 	    id_to_name(id, aarg1, &name);
 	} else if (!strcmp(aarg1, "STRING")) {
@@ -320,7 +330,6 @@ EXEC SQL END DECLARE SECTION;
 	}
 	strcpy(aarg2, name);
 	free(name);
-	afterc = 4;
     } else if (!strcmp(table, "clear")) {
 	afterc = 0;
 	table = beforetable;