Commit d03f741c authored by Mike Hibler's avatar Mike Hibler

Remove print of error message if no TPM info.

A node having no TPM info is not an error (right now anyway) so don't
complain about it, since it confuses Mike.

Also, do a little Old Fart Normal Form code formatting enforcement.
parent a4c25077
...@@ -8210,16 +8210,15 @@ COMMAND_PROTOTYPE(dotpmblob) ...@@ -8210,16 +8210,15 @@ COMMAND_PROTOTYPE(dotpmblob)
"where node_id='%s' ", "where node_id='%s' ",
1, reqp->nodeid); 1, reqp->nodeid);
if (!res){ if (!res) {
error("gettpmblob: %s: DB error getting tpmblob\n", error("gettpmblob: %s: DB error getting tpmblob\n",
reqp->nodeid); reqp->nodeid);
return 1; return 1;
} }
nrows = mysql_num_rows(res); nrows = mysql_num_rows(res);
if (!nrows) {
if (!nrows){ error("%s: no node_hostkeys info in the database!\n",
error("%s: no tpmblob in database for this node.\n",
reqp->nodeid); reqp->nodeid);
mysql_free_result(res); mysql_free_result(res);
return 1; return 1;
...@@ -8227,23 +8226,25 @@ COMMAND_PROTOTYPE(dotpmblob) ...@@ -8227,23 +8226,25 @@ COMMAND_PROTOTYPE(dotpmblob)
row = mysql_fetch_row(res); row = mysql_fetch_row(res);
nlen = mysql_fetch_lengths(res); nlen = mysql_fetch_lengths(res);
if (!nlen || !nlen[0]){ if (!nlen || !nlen[0]) {
error("%s: invalid blob length.\n",
reqp->nodeid);
mysql_free_result(res); mysql_free_result(res);
#if 0 /* not an error yet */
error("%s: no TPM blob.\n", reqp->nodeid);
return 1; return 1;
#endif
return 0;
} }
bufp += OUTPUT(bufp, bufe - bufp, bufp += OUTPUT(bufp, bufe - bufp,
(hex ? "BLOBHEX=" : "BLOB=")); (hex ? "BLOBHEX=" : "BLOB="));
if (hex){ if (hex) {
for (i = 0;i < nlen[0];++i) for (i = 0;i < nlen[0];++i)
bufp += OUTPUT(bufp, bufe - bufp, bufp += OUTPUT(bufp, bufe - bufp,
"%.02x", (0xff & ((char)*(row[0]+i)))); "%.02x", (0xff & ((char)*(row[0]+i))));
} else{ } else {
for (i = 0;i < nlen[0];++i) for (i = 0;i < nlen[0];++i)
bufp += OUTPUT(bufp, bufe - bufp, bufp += OUTPUT(bufp, bufe - bufp,
"%c", (char)*(row[0]+i)); "%c", (char)*(row[0]+i));
} }
bufp += OUTPUT(bufp, bufe - bufp, "\n"); bufp += OUTPUT(bufp, bufe - bufp, "\n");
...@@ -8271,13 +8272,22 @@ COMMAND_PROTOTYPE(dotpmpubkey) ...@@ -8271,13 +8272,22 @@ COMMAND_PROTOTYPE(dotpmpubkey)
} }
nrows = mysql_num_rows(res); nrows = mysql_num_rows(res);
if (!nrows) { if (!nrows) {
error("%s: no tpmx509 in database for this node.\n", error("%s: no node_hostkeys info in the database!\n",
reqp->nodeid); reqp->nodeid);
mysql_free_result(res); mysql_free_result(res);
return 1; return 1;
} }
row = mysql_fetch_row(res); row = mysql_fetch_row(res);
if (!row || !row[0]) {
mysql_free_result(res);
#if 0 /* not an error yet */
error("%s: no x509 cert.\n", reqp->nodeid);
return 1;
#endif
return 0;
}
OUTPUT(buf, sizeof(buf), "TPMPUB=%s\n", row[0]); OUTPUT(buf, sizeof(buf), "TPMPUB=%s\n", row[0]);
client_writeback(sock, buf, strlen(buf), tcp); client_writeback(sock, buf, strlen(buf), tcp);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment