From: Eric Bollengier <eric@baculasystems.com>
Date: Thu, 9 Nov 2023 07:38:04 +0000 (+0100)
Subject: Fix #10163 Add %i (jobid) to edit_device_codes()
X-Git-Tag: Beta-15.0.1~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cdb7b540b377bcebc379f5a0c5ab13fac8c1dcf;p=thirdparty%2Fbacula.git

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

diff --git a/bacula/src/stored/autochanger.c b/bacula/src/stored/autochanger.c
index 294509c3e..428b726a3 100644
--- 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]) {