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;
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);