Commit backports from 2.3.x

[bacula/bacula] / bacula / src / dird / ua_update.c

diff --git a/bacula/src/dird/ua_update.c b/bacula/src/dird/ua_update.c
index b55e3dd97b9f21c9c91e8fe9c822cddfb4b2fa86..da87a02fed6462565cb97f792d6fd88967729c30 100644 (file)
--- a/bacula/src/dird/ua_update.c
+++ b/bacula/src/dird/ua_update.c
@@ -242,7 +242,7 @@ static void update_volrecycle(UAContext *ua, char *val, MEDIA_DBR *mr)
       ua->error_msg("%s", db_strerror(ua->db));
    } else {
       ua->info_msg(_("New Recycle flag is: %s\n"),
-         mr->Recycle==1?_("yes"):_("no"));
+         recycle==1?_("yes"):_("no"));
    }
 }
 
@@ -262,7 +262,7 @@ static void update_volinchanger(UAContext *ua, char *val, MEDIA_DBR *mr)
       ua->error_msg("%s", db_strerror(ua->db));
    } else {
       ua->info_msg(_("New InChanger flag is: %s\n"),
-         mr->InChanger==1?_("yes"):_("no"));
+         InChanger==1?_("yes"):_("no"));
    }
 }
 
@@ -429,6 +429,7 @@ static int update_volume(UAContext *ua)
    POOL *pool;
    POOL_DBR pr;
    POOLMEM *query;
+   char buf[1000];
    char ed1[130];
    bool done = false;
    int i;
@@ -622,7 +623,9 @@ static int update_volume(UAContext *ua)
          
       case 8:                         /* InChanger */
          ua->info_msg(_("Current InChanger flag is: %d\n"), mr.InChanger);
-         if (!get_yesno(ua, _("Set InChanger flag? yes/no: "))) {
+         bsnprintf(buf, sizeof(buf), _("Set InChanger flag for Volume \"%s\": yes/no: "),
+            mr.VolumeName);
+         if (!get_yesno(ua, buf)) {
             return 0;
          }
          mr.InChanger = ua->pint32_val;
@@ -649,7 +652,7 @@ static int update_volume(UAContext *ua)
          VolFiles = ua->pint32_val;
          if (VolFiles != (int)(mr.VolFiles + 1)) {
             ua->warning_msg(_("Normally, you should only increase Volume Files by one!\n"));
-            if (!get_yesno(ua, _("Continue? (yes/no): ")) || ua->pint32_val == 0) {
+            if (!get_yesno(ua, _("Increase Volume Files? (yes/no): ")) || ua->pint32_val == 0) {
                break;
             }
          }