Added missing definition of $(SRCDIR)

[moira.git] / gen / hosts.dc

diff --git a/gen/hosts.dc b/gen/hosts.dc
index 0e396a5f985020eb6065a38f591eb68a5da2b9f2..9c4f4c59fedb1fd0d382184d3332734868125768 100644 (file)
--- a/gen/hosts.dc
+++ b/gen/hosts.dc
@@ -78,6 +78,7 @@ char **argv;
     while (1) {
        EXEC SQL FETCH y INTO :id, :name;
        if (sqlca.sqlcode != 0) break;
+       if (id == 0) continue;
        if (*strtrim(name) == 0) continue;
        if ((i = strlen(name)) < 9 || strcmp(&name[i-8], ".MIT.EDU")) {
            fprintf(stderr, "Name %s not in MIT domain\n", name);
@@ -87,8 +88,8 @@ char **argv;
        }
        if (p = hash_lookup(aliases, id)) {
            sprintf(buf, "%s,%s", p, name);
-           free(p);
            hash_update(aliases, id, strsave(buf));
+           free(p);
        } else
          hash_store(aliases, id, strsave(name));
     }
@@ -100,6 +101,7 @@ char **argv;
     while (1) {
        EXEC SQL FETCH x INTO :name, :id, :vendor, :model, :os, :addr;
        if (sqlca.sqlcode != 0) break;
+       if (id == 0) continue;
        if (*strtrim(name) == 0) continue;
        if ((i = strlen(name)) < 9 || strcmp(&name[i-8], ".MIT.EDU")) {
            fprintf(stderr, "Name %s not in MIT domain\n", name);
@@ -111,17 +113,20 @@ char **argv;
        strtrim(model);
        strtrim(os);
        strtrim(addr);
-       if (*addr == 0)
+       if (*addr == 0 || inet_addr(addr) == -1)
          continue;
        if (p = hash_lookup(aliases, id))
          sprintf(buf, "%s,%s", name, p);
        else
          strcpy(buf, name);
        fprintf(out, "HOST : %s : %s : ", addr, buf);
-       if (*vendor && *model)
-         fprintf(out, "%s/%s : %s :\n", vendor, model, os);
-       else
-         fprintf(out, "%s%s : %s :\n", vendor, model, os);
+       if ((*vendor || *model) && *os) {
+           if (*vendor && *model)
+             fprintf(out, "%s/%s : %s :\n", vendor, model, os);
+           else
+             fprintf(out, "%s%s : %s :\n", vendor, model, os);
+       } else
+         fputs("\n", out);
     }
 
     EXEC SQL CLOSE x;
@@ -143,6 +148,10 @@ char **argv;
 
  sqlerr:
     com_err(whoami, MR_INGRES_ERR, " code %d\n", sqlca.sqlcode);
+#ifsql INGRES
+    if (sqlca.sqlcode == 17700 || sqlca.sqlcode == -37000)
+      exit(MR_DEADLOCK);
+#endsql
     critical_alert("DCM", "Hosts build encountered INGRES ERROR %d",
                   sqlca.sqlcode);
     exit(MR_INGRES_ERR);