From: mar <mar>
Date: Wed, 1 Dec 1993 14:08:29 +0000 (+0000)
Subject: don't print empty type fields & don't print entries with bad addresses
X-Git-Tag: release77~38
X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/commitdiff_plain/b61b1212ebe7ab716ce0de919ee3991004c63164

don't print empty type fields & don't print entries with bad addresses
---

diff --git a/gen/hosts.dc b/gen/hosts.dc
index 207d3590..9c4f4c59 100644
--- a/gen/hosts.dc
+++ b/gen/hosts.dc
@@ -113,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;