Skip to content

tree: preserve dhchap_key to during scan #1088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
igaw merged 1 commit into from
Nov 4, 2025
+6 −4
Merged

tree: preserve dhchap_key to during scan #1088

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/nvme/tree.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2245,6 +2245,7 @@ nvme_ctrl_t nvme_scan_ctrl(nvme_root_t r, const char *name)
_cleanup_free_ char *subsysnqn = NULL, *subsysname = NULL;
_cleanup_free_ char *hostnqn = NULL, *hostid = NULL;
_cleanup_free_ char *path = NULL;
char *host_key;
nvme_host_t h;
nvme_subsystem_t s;
nvme_ctrl_t c;
Expand All @@ -2261,12 +2262,13 @@ nvme_ctrl_t nvme_scan_ctrl(nvme_root_t r, const char *name)
hostid = nvme_get_attr(path, "hostid");
h = nvme_lookup_host(r, hostnqn, hostid);
if (h) {
free(h->dhchap_key);
h->dhchap_key = nvme_get_attr(path, "dhchap_secret");
if (h->dhchap_key && !strcmp(h->dhchap_key, "none")) {
host_key = nvme_get_attr(path, "dhchap_secret");
if (host_key && strcmp(host_key, "none")) {
free(h->dhchap_key);
h->dhchap_key = NULL;
h->dhchap_key = host_key;
host_key = NULL;
}
free(host_key);
}
if (!h) {
h = nvme_default_host(r);
Expand Down