From: Radosław Korzeniewski <radekk@inteos.pl>
Date: Mon, 28 Oct 2019 15:34:31 +0000 (+0100)
Subject: Fix error on .ls when plugin name without ':'
X-Git-Tag: Release-9.6.0~106
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c080a0d32f70d6ae6b292f9d0008e7100d83e638;p=thirdparty%2Fbacula.git

Fix error on .ls when plugin name without ':'

Closes #0005548 and #0005549.
---

diff --git a/bacula/src/dird/fd_cmds.c b/bacula/src/dird/fd_cmds.c
index ce594a6cd..3fd03688c 100644
--- a/bacula/src/dird/fd_cmds.c
+++ b/bacula/src/dird/fd_cmds.c
@@ -632,7 +632,7 @@ bool send_include_list(JCR *jcr)
 }
 
 /*
- * Send a include list with a plugin and listing=<path> parameter
+ * Send an include list with a plugin and listing=<path> parameter
  */
 bool send_ls_plugin_fileset(JCR *jcr, const char *plugin, const char *path)
 {
@@ -642,7 +642,7 @@ bool send_ls_plugin_fileset(JCR *jcr, const char *plugin, const char *path)
    fd->fsend("I\n");
    fd->fsend("O h\n");         /* is it required? */
    fd->fsend("N\n");
-   fd->fsend("P %s listing=%s\n", plugin, path);
+   fd->fsend("P %s%s listing=%s\n", plugin, strchr(plugin, ':') == NULL ? ":" : "", path);
    fd->fsend("N\n");
    fd->signal(BNET_EOD);              /* end of data */