From: Eric Bollengier <eric@baculasystems.com>
Date: Thu, 7 Oct 2021 16:26:47 +0000 (+0200)
Subject: Add CustomerId Director::Director directive
X-Git-Tag: Beta-15.0.0~857
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85e35b7483b1fe789b70bb783463fd9791774550;p=thirdparty%2Fbacula.git

Add CustomerId Director::Director directive
---

diff --git a/bacula/src/dird/dird_conf.c b/bacula/src/dird/dird_conf.c
index ae706f1a7..471be5506 100644
--- a/bacula/src/dird/dird_conf.c
+++ b/bacula/src/dird/dird_conf.c
@@ -402,7 +402,8 @@ static RES_ITEM dir_items[] = {
    {"TlsDhFile",            store_dir,       ITEM(res_dir.tls_dhfile), 0, 0, 0},
    {"TlsAllowedCn",         store_alist_str, ITEM(res_dir.tls_allowed_cns), 0, 0, 0},
    {"StatisticsRetention",  store_time,      ITEM(res_dir.stats_retention),  0, ITEM_DEFAULT, 60*60*24*31*12*5},
-   {"VerId",                store_str,       ITEM(res_dir.verid), 0, 0, 0},
+   {"VerId",           store_str,       ITEM(res_dir.verid), 0, 0, 0},
+   {"CustomerId",           store_str,       ITEM(res_dir.customerid), 0, 0, 0},
    {"CommCompression",      store_bool,      ITEM(res_dir.comm_compression), 0, ITEM_DEFAULT, true},
    {NULL, NULL, {0}, 0, 0, 0}
 };
@@ -1636,6 +1637,9 @@ void free_resource(RES *rres, int type)
       if (res->res_dir.verid) {
          free(res->res_dir.verid);
       }
+      if (res->res_dir.customerid) {
+         free(res->res_dir.customerid);
+      }
       break;
    case R_DEVICE:
    case R_COUNTER:
diff --git a/bacula/src/dird/dird_conf.h b/bacula/src/dird/dird_conf.h
index cfce7e9e4..526d010af 100644
--- a/bacula/src/dird/dird_conf.h
+++ b/bacula/src/dird/dird_conf.h
@@ -129,6 +129,7 @@ public:
    bool tls_require;                  /* Require TLS */
    bool tls_verify_peer;              /* TLS Verify Client Certificate */
    char *verid;                       /* Custom Id to print in version command */
+   char *customerid;                  /* Custom CustomerID */
    /* Methods */
    char *name() const;
 };