From: Eric Bollengier <eric@baculasystems.com>
Date: Fri, 30 Apr 2021 08:03:30 +0000 (+0200)
Subject: Fix org#2605 About incorrect message in restore command
X-Git-Tag: Release-11.0.3~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d613121929e7d73e5b294b3dede6314b8fa4f3f7;p=thirdparty%2Fbacula.git

Fix org#2605 About incorrect message in restore command

Description:
------------

The error message generated when the fileset parameter of the
restore command is invalid is misleading.

*restore fileset= where=/tmp select all done yes
FileSet argument: Volume name must be at least one character long.
                 ^^^^^^^
---

diff --git a/bacula/src/lib/edit.c b/bacula/src/lib/edit.c
index f9cdfd165..9cd90d2ed 100644
--- a/bacula/src/lib/edit.c
+++ b/bacula/src/lib/edit.c
@@ -505,7 +505,7 @@ bool is_name_valid(const char *name, POOLMEM **msg)
  * Check if Bacula Resoure Name is valid
  */
 /*
- * Check if the Volume name has legal characters
+ * Check if the Volume/resource name has legal characters
  * If ua is non-NULL send the message
  */
 bool is_name_valid(const char *name, POOLMEM **msg, const char *accept)
@@ -539,7 +539,7 @@ bool is_name_valid(const char *name, POOLMEM **msg, const char *accept)
    }
    if (len == 0) {
       if (msg) {
-         Mmsg(msg,  _("Volume name must be at least one character long.\n"));
+         Mmsg(msg,  _("Name must be at least one character long.\n"));
       }
       return false;
    }