Merge pull request #138 from tbzatek/fabrics-fixes-3

Misc. fabrics fixes

Author: dwsuse

src/nvme/fabrics.c

@@ -958,7 +958,7 @@ char *nvmf_hostnqn_generate()
 	if (ret < 0)
 		return NULL;
 
-	if (asprintf(&hostnqn, "nqn.2014-08.org.nvmexpress:uuid:%s\n", uuid_str) < 0)
+	if (asprintf(&hostnqn, "nqn.2014-08.org.nvmexpress:uuid:%s", uuid_str) < 0)
 		return NULL;
 
 	return hostnqn;

src/nvme/fabrics.h

@@ -179,7 +179,7 @@ int nvmf_get_discovery_log(nvme_ctrl_t c, struct nvmf_discovery_log **logp,
 
 /**
  * nvmf_hostnqn_generate() - Generate a machine specific host nqn
- * Returns: An nvm namespace qualifieid name string based on the machine
+ * Returns: An nvm namespace qualified name string based on the machine
  * identifier, or NULL if not successful.
  */
 char *nvmf_hostnqn_generate();

src/nvme/tree.c

@@ -374,8 +374,8 @@ struct nvme_host *nvme_lookup_host(nvme_root_t r, const char *hostnqn,
 	nvme_for_each_host(r, h) {
 		if (strcmp(h->hostnqn, hostnqn))
 			continue;
-		if (hostid &&
-		    strcmp(h->hostid, hostid))
+		if (hostid && (!h->hostid ||
+		    strcmp(h->hostid, hostid)))
 			continue;
 		return h;
 	}