removed unique check for network saddr

[moira.git] / server / qsetup.dc

diff --git a/server/qsetup.dc b/server/qsetup.dc
index c3cb37ed9c1d0e2ec9a602ecdc285b26d894e976..450619fd81b02ce4755d3ee764147aeb22198514 100644 (file)
--- a/server/qsetup.dc
+++ b/server/qsetup.dc
@@ -314,7 +314,6 @@ int setup_alis(q, argv, cl)
     EXEC SQL BEGIN DECLARE SECTION;
     int ngid;
     EXEC SQL END DECLARE SECTION;
-    char *malloc();
     unsigned char *p;
     int idx;
 
@@ -711,7 +710,7 @@ setup_dnfp(q, argv, cl)
 
     id = *(int *)argv[0];
     dir = argv[1];
-    EXEC SQL REPEATED SELECT fs.tid INTO :cnt FROM filesys fs, nfsphys np
+    EXEC SQL REPEATED SELECT count(fs.tid) INTO :cnt FROM filesys fs, nfsphys np
       WHERE fs.mach_id = :id AND fs.phys_id = np.nfsphys_id
        AND np.mach_id = :id AND np.dir = :dir;
     if (cnt > 0)
@@ -927,8 +926,10 @@ setup_ahst(q,argv,cl)
          value = -1;
        else
          value = -2;
-    } else
-      value = ntohl(inet_addr(argv[9+row]));
+    } else {
+       value = ntohl(inet_addr(argv[9+row]));
+       if (value == -1) return(MR_ADDRESS);
+    }
     if (value == 0) return(MR_ADDRESS);
     if (value != -1) {
        id = *(int *)argv[8+row];
@@ -967,21 +968,22 @@ setup_ahst(q,argv,cl)
              value = htonl(value);
        }
        value = htonl(value);
-       argv[9+row] = strsave(inet_ntoa(value));
+       strcpy(argv[9+row], inet_ntoa(value));
     } else {
-       argv[9+row] = strsave("unassigned");
+       strcpy(argv[9+row], "unassigned");
     }
 
     /* status checking */
     value = atoi(argv[7+row]);
-    if (row == 0 && !(value == 1 || value == 3))
+    if (row == 0 && !(value == 1 || value == 0))
       return(MR_TYPE);
     if (row == 1) {
        id = *(int *)argv[0];
        EXEC SQL SELECT status INTO :cnt FROM machine WHERE mach_id = :id;
        if (ingres_errno) return(mr_errcode);
        if (value != cnt) {
-           EXEC SQL UPDATE machine SET statuschange = date('now');
+           EXEC SQL UPDATE machine SET statuschange = date('now')
+                 WHERE mach_id = :id;
        }
     }
 
@@ -1013,13 +1015,20 @@ setup_ahst(q,argv,cl)
          return(MR_PERM);
     }
 
+    /*
+     * If this is an update_host query, we're done.
+     */
+    if (row == 1)
+       return(MR_SUCCESS);
+
+    /*
+     * For an add_host query, allocate and fill in a new machine id,
+     * and then insert the creator id.
+     */
     if ((mr_errcode = prefetch_value(q,argv,cl)) != MR_SUCCESS)
       return(mr_errcode);
 
-    row = q->argc + q->vcnt + 1;
-    sprintf(buf, "%d",cl->client_id);
-    argv[row] = strsave(buf);
-    argv[row+1] = NULL;
+    sprintf(argv[q->argc + q->vcnt + 1], "%d",cl->client_id);
     return(MR_SUCCESS);
 }