From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 1 Feb 2021 12:10:59 +0000 (+0100)
Subject: cmdSecretSetValue: Make it obvious that --file, --base64 and --interactive are exlcusive
X-Git-Tag: v7.1.0-rc1~327
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26fedf92187faccbdf5b34be8bc9fda26a02e055;p=thirdparty%2Flibvirt.git

cmdSecretSetValue: Make it obvious that --file, --base64 and --interactive are exlcusive

Convert the conditions to else if so that it's obvious that only one of
the cases will ever be used.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c
index 16accc8ad2..5d656151e8 100644
--- a/tools/virsh-secret.c
+++ b/tools/virsh-secret.c
@@ -225,16 +225,10 @@ cmdSecretSetValue(vshControl *ctl, const vshCmd *cmd)
     if (vshCommandOptStringReq(ctl, cmd, "file", &filename) < 0)
         return false;
 
-    if (!base64 && !filename && !interactive) {
-        vshError(ctl, _("Input secret value is missing"));
-        return false;
-    }
-
-    /* warn users that the --base64 option passed from command line is wrong */
-    if (base64)
+    if (base64) {
+        /* warn users that the --base64 option passed from command line is wrong */
         vshError(ctl, _("Passing secret value as command-line argument is insecure!"));
-
-    if (filename) {
+    } else if (filename) {
         ssize_t read_ret;
         if ((read_ret = virFileReadAll(filename, 1024, &file_buf)) < 0) {
             vshSaveLibvirtError();
@@ -243,9 +237,7 @@ cmdSecretSetValue(vshControl *ctl, const vshCmd *cmd)
 
         file_len = read_ret;
         base64 = file_buf;
-    }
-
-    if (interactive) {
+    } else if (interactive) {
         vshPrint(ctl, "%s", _("Enter new value for secret:"));
         fflush(stdout);
 
@@ -255,6 +247,9 @@ cmdSecretSetValue(vshControl *ctl, const vshCmd *cmd)
         }
         file_len = strlen(file_buf);
         plain = true;
+    } else {
+        vshError(ctl, _("Input secret value is missing"));
+        return false;
     }
 
     if (plain) {