ndctl: Fix building in the absence of keyutils

Fix build errors when ndctl is configured without keyutils support. Fixes: 79728f1 ("ndctl: allow for a 'secure erase' using the master passphrase") Fixes: 9925be9 ("ndctl: add a load-keys command and a modprobe config") Signed-off-by: Oliver O'Halloran <[email protected]> Signed-off-by: Vishal Verma <[email protected]>
pmem · Feb 5, 2019 · 8ca46ad · 8ca46ad
1 parent f407a8b
commit 8ca46ad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/ndctl/ndctl.c b/ndctl/ndctl.c
@@ -93,7 +93,9 @@ static struct cmd_struct commands[] = {
 	{ "remove-passphrase", { cmd_remove_passphrase } },
 	{ "freeze-security", { cmd_freeze_security } },
 	{ "sanitize-dimm", { cmd_sanitize_dimm } },
+#ifdef ENABLE_KEYUTILS
 	{ "load-keys", { cmd_load_keys } },
+#endif
 	{ "wait-overwrite", { cmd_wait_overwrite } },
 	{ "list", { cmd_list } },
 	{ "monitor", { cmd_monitor } },

diff --git a/ndctl/util/keys.h b/ndctl/util/keys.h
@@ -46,7 +46,7 @@ static inline int ndctl_dimm_remove_key(struct ndctl_dimm *dimm)
 }
 
 static inline int ndctl_dimm_secure_erase_key(struct ndctl_dimm *dimm,
-		enum ndctl_key_type key_type);
+		enum ndctl_key_type key_type)
 {
 	return -EOPNOTSUPP;
 }