From: Ján Tomko <jtomko@redhat.com>
Date: Wed, 26 Jan 2022 12:25:44 +0000 (+0100)
Subject: virsh: domsetlaunchsecstate: report error if no options are passed
X-Git-Tag: v8.1.0-rc1~250
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d248e3dca83f1fc51599e02b827f35bc21fcaeb0;p=thirdparty%2Flibvirt.git

virsh: domsetlaunchsecstate: report error if no options are passed

We already exit if they are not present.

Report an error, but do not mark them as required in case a future
version of this command will want to accept a different set of
parameters.

https://bugzilla.redhat.com/show_bug.cgi?id=2046024

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index b56f6a90f5..43d310f2af 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -9627,8 +9627,10 @@ cmdDomSetLaunchSecState(vshControl * ctl, const vshCmd * cmd)
     if (vshCommandOptStringReq(ctl, cmd, "secret", &secfile) < 0)
         return false;
 
-    if (sechdrfile == NULL || secfile == NULL)
+    if (sechdrfile == NULL || secfile == NULL) {
+        vshError(ctl, "%s", _("Both secret and the secret header are required"));
         return false;
+    }
 
     if (virFileReadAll(sechdrfile, 1024*64, &sechdr) < 0) {
         vshSaveLibvirtError();