From: Alain Spineux <alain@baculasystems.com>
Date: Fri, 11 Mar 2022 14:09:22 +0000 (+0100)
Subject: dedup: remove s at the end of dedupengine in ".status dedupengine"
X-Git-Tag: Beta-15.0.0~627
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6413ffd96ee28d1b8e3b59192d89a1d045426d00;p=thirdparty%2Fbacula.git

dedup: remove s at the end of dedupengine in ".status dedupengine"

- the right syntax are
  * .status dedupengine # to get the status of all dedupengines
  * .status dedupengine name=XXXX # for the status of dedupegine XXXX
---

diff --git a/bacula/src/dird/ua_status.c b/bacula/src/dird/ua_status.c
index 295dd7ca4..1c70c18d4 100644
--- a/bacula/src/dird/ua_status.c
+++ b/bacula/src/dird/ua_status.c
@@ -615,10 +615,10 @@ static void do_storage_status(UAContext *ua, STORE *store, char *cmd)
          }
          sd->fsend(".status %s api=%d api_opts=%s %s",
                    cmd, ua->api, ua->api_opts, devname.c_str());
-      } else if (strcasecmp(cmd, "dedupengines") == 0) {
-         i = find_arg_with_value(ua, "dedupengine");
+      } else if (strcasecmp(cmd, "dedupengine") == 0) {
+         i = find_arg_with_value(ua, "name");
          if (i>0) {
-            Mmsg(devname, "dedupengine=%s", ua->argv[i]);
+            Mmsg(devname, "name=%s", ua->argv[i]);
             bash_spaces(devname.c_str());
          }
          sd->fsend(".status %s api=%d api_opts=%s %s",
diff --git a/bacula/src/stored/status.c b/bacula/src/stored/status.c
index 0834c45b4..712fa0dd1 100644
--- a/bacula/src/stored/status.c
+++ b/bacula/src/stored/status.c
@@ -1162,7 +1162,7 @@ bool qstatus_cmd(JCR *jcr)
    char *cmd;
    char *device=NULL;
    char *collname=NULL;
-   char *dedupengine=NULL;
+   char *name=NULL;
    int api = true;
 
    sp.bs = dir;
@@ -1199,9 +1199,9 @@ bool qstatus_cmd(JCR *jcr)
       } else if (!strcmp(argk[i], "api_opts") && argv[i]) {
          bstrncpy(sp.api_opts, argv[i], sizeof(sp.api_opts));
       }
-      else if (!strcmp(argk[i], "dedupengine") && argv[i]) {
-         dedupengine = argv[i];
-         unbash_spaces(dedupengine);
+      else if (!strcmp(argk[i], "name") && argv[i]) {
+         name = argv[i];
+         unbash_spaces(name);
       }
    }
 
@@ -1246,10 +1246,10 @@ bool qstatus_cmd(JCR *jcr)
        sp.api = api;
        show_config(&sp);
    /* ***BEEF*** */
-   } else if (strcasecmp(cmd, "dedupengines") == 0 ||
+   } else if (strcasecmp(cmd, "dedupengine") == 0 ||
               strcasecmp(cmd, "dedupengineandzerostats") == 0) {
       sp.api = api;
-      list_dedupengines(cmd, &sp, dedupengine);
+      list_dedupengines(cmd, &sp, name);
    } else if (strcasecmp(cmd, "shstore") == 0) {
       list_shared_storage(&sp, dir->msg);
    } else if (strcasecmp(cmd, "cloud") == 0) {