File d248e3dc-virsh-domsetlaunchsecstate-report-erro... of Package libvirt.26629

Overview Repositories Revisions Requests Users Attributes Meta

File d248e3dc-virsh-domsetlaunchsecstate-report-error.patch of Package libvirt.26629

commit d248e3dca83f1fc51599e02b827f35bc21fcaeb0
Author: Ján Tomko <jtomko@redhat.com>
Date:   Wed Jan 26 13:25:44 2022 +0100

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>

Index: libvirt-8.0.0/tools/virsh-domain.c
===================================================================
--- libvirt-8.0.0.orig/tools/virsh-domain.c
+++ libvirt-8.0.0/tools/virsh-domain.c
@@ -9627,8 +9627,10 @@ cmdDomSetLaunchSecState(vshControl * ctl
     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();

Places

File d248e3dc-virsh-domsetlaunchsecstate-report-error.patch of Package libvirt.26629

Places