From b552f51c92d24beadbfb6619e8dacde6a5d4e805 Mon Sep 17 00:00:00 2001
From: Marco van Wieringen <marco.van.wieringen@bareos.com>
Date: Thu, 16 May 2013 10:20:35 +0200
Subject: [PATCH] Fix for naming difference between branches.

---
 src/dird/job.c       |  6 +++---
 src/dird/ua_status.c | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/dird/job.c b/src/dird/job.c
index 31cd918b587..41b81766152 100644
--- a/src/dird/job.c
+++ b/src/dird/job.c
@@ -476,10 +476,10 @@ static void *job_thread(void *arg)
    /*
     * Check for subscriptions and issue a warning when exceeded.
     */
-   if (me->subscriptions &&
-       me->subscriptions < me->subscriptions_used) {
+   if (director->subscriptions &&
+       director->subscriptions < director->subscriptions_used) {
       Jmsg(jcr, M_WARNING, 0, _("Subscriptions exceeded: (used/total) (%d/%d)\n"),
-           me->subscriptions_used, me->subscriptions);
+           director->subscriptions_used, director->subscriptions);
    }
 
    run_scripts(jcr, jcr->res.job->RunScripts, "AfterJob");
diff --git a/src/dird/ua_status.c b/src/dird/ua_status.c
index 3a6af895158..c01944eb0ad 100644
--- a/src/dird/ua_status.c
+++ b/src/dird/ua_status.c
@@ -546,23 +546,23 @@ static bool do_subscription_status(UAContext *ua)
    /*
     * See if we need to check.
     */
-   if (me->subscriptions == 0) {
+   if (director->subscriptions == 0) {
       ua->send_msg(_("No subscriptions configured in director.\n"));
       retval = true;
       goto bail_out;
    }
 
-   if (me->subscriptions_used <= 0) {
+   if (director->subscriptions_used <= 0) {
       ua->error_msg(_("No clients defined.\n"));
       goto bail_out;
    } else {
-      available = me->subscriptions - me->subscriptions_used;
+      available = director->subscriptions - director->subscriptions_used;
       if (available < 0) {
          ua->send_msg(_("Warning! No available subscriptions: %d (%d/%d) (used/total)\n"),
-                      available, me->subscriptions_used, me->subscriptions);
+                      available, director->subscriptions_used, director->subscriptions);
       } else {
          ua->send_msg(_("Ok: available subscriptions: %d (%d/%d) (used/total)\n"),
-                      available, me->subscriptions_used, me->subscriptions);
+                      available, director->subscriptions_used, director->subscriptions);
          retval = true;
       }
    }