From: Eric Bollengier <eric@baculasystems.com>
Date: Tue, 15 Sep 2015 09:11:28 +0000 (+0200)
Subject: Avoid <NULL> string displayed in restore menu
X-Git-Tag: Release-7.4.0~197
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5b5b813c291a7a14acb1288705b95f686f3f6714;p=bacula%2Fbacula

Avoid <NULL> string displayed in restore menu

do_prompt expects automsg to be set, but we use NULL in various places.

Select parameter to modify (1-13): 13
Automatically selected : bpipe:/@bpipe@/encrypt-bug.jpg:cat 1:cat >/tmp/1
Plugin Restore Options
restore_command:     *None*
Use above plugin configuration? (yes/mod/no): mod
Automatically selected <NULL>: restore_command (Restore command to use)
                       ^^^^^^
---

diff --git a/bacula/src/dird/ua_select.c b/bacula/src/dird/ua_select.c
index 343dbbead8..68cbefc53e 100644
--- a/bacula/src/dird/ua_select.c
+++ b/bacula/src/dird/ua_select.c
@@ -911,7 +911,7 @@ int do_prompt(UAContext *ua, const char *automsg, const char *msg,
       if (prompt) {
          bstrncpy(prompt, ua->prompt[1], max_prompt);
       }
-      ua->send_msg(_("Automatically selected %s: %s\n"), automsg, ua->prompt[1]);
+      ua->send_msg(_("Automatically selected %s: %s\n"), NPRTB(automsg), ua->prompt[1]);
       goto done;
    }
    /* If running non-interactive, bail out */