Fix #10163 Add %i (jobid) to edit_device_codes()

diff --git a/bacula/src/stored/autochanger.c b/bacula/src/stored/autochanger.c
index 294509c3e25426dec42b30fd5269b5d05331deeb..428b726a38825a541c9a36797cad849e37276a84 100644 (file)
--- a/bacula/src/stored/autochanger.c
+++ b/bacula/src/stored/autochanger.c
@@ -718,6 +718,7 @@ bail_out:
  *  %c = changer device name
  *  %d = changer drive index
  *  %f = Client's name
+ *  %i = JobId
  *  %j = Job name
  *  %l = archive control channel name
  *  %o = command
@@ -773,8 +774,12 @@ void edit_device_codes(DCR *dcr, POOLMEM **omsg, const char *imsg, const char *c
             sprintf(add, "%d", dcr->VolCatInfo.Slot);
             str = add;
             break;
+        case 'i':
+           sprintf(add, "%d", dcr->jcr ? dcr->jcr->JobId : 0);
+           str = add;
+           break;
          case 'j':                    /* Job name */
-            str = dcr->jcr->Job;
+            str = dcr->jcr ? dcr->jcr->Job : "";
             break;
          case 'v':
             if (dcr->dev->LoadedVolName[0]) {