zwrite to instance "moira" [dkk]

[moira.git] / server / increment.dc

diff --git a/server/increment.dc b/server/increment.dc
index 462718af3fca367714da597d98a06c4c40bd2de5..c81361a616c2b4c0a5dd07ae824f85cf4d44aba0 100644 (file)
--- 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")) {
@@ -197,8 +196,12 @@ char **argv;
        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")) {
@@ -208,7 +211,6 @@ char **argv;
        }
        strcpy(barg2, name);
        free(name);
-       beforec = 9;
     } /* else
       com_err(whoami, 0, "unknown table in incremental_before"); */
 }
@@ -248,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")) {
@@ -313,8 +315,12 @@ EXEC SQL END DECLARE SECTION;
        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")) {
@@ -324,7 +330,6 @@ EXEC SQL END DECLARE SECTION;
        }
        strcpy(aarg2, name);
        free(name);
-       afterc = 9;
     } else if (!strcmp(table, "clear")) {
        afterc = 0;
        table = beforetable;