diff options
Diffstat (limited to 'core/src/dird/ua_select.cc')
| -rw-r--r-- | core/src/dird/ua_select.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/core/src/dird/ua_select.cc b/core/src/dird/ua_select.cc index b8c013fc6..d3ba0e83b 100644 --- a/core/src/dird/ua_select.cc +++ b/core/src/dird/ua_select.cc @@ -29,7 +29,7 @@ #include "include/bareos.h" #include "dird.h" #include "dird/dird_globals.h" -#include "dird/jcr_private.h" +#include "dird/director_jcr_impl.h" #include "dird/storage.h" #include "dird/ua_input.h" #include "dird/ua_select.h" @@ -1332,7 +1332,7 @@ StorageResource* get_storage_resource(UaContext* ua, ua->ErrorMsg(_("JobId %s is not running.\n"), edit_int64(jobid, ed1)); return NULL; } - store = jcr->impl->res.write_storage; + store = jcr->dir_impl->res.write_storage; FreeJcr(jcr); break; } else if (Bstrcasecmp(ua->argk[i], NT_("job")) @@ -1345,7 +1345,7 @@ StorageResource* get_storage_resource(UaContext* ua, ua->ErrorMsg(_("Job \"%s\" is not running.\n"), ua->argv[i]); return NULL; } - store = jcr->impl->res.write_storage; + store = jcr->dir_impl->res.write_storage; FreeJcr(jcr); break; } else if (Bstrcasecmp(ua->argk[i], NT_("ujobid"))) { @@ -1357,7 +1357,7 @@ StorageResource* get_storage_resource(UaContext* ua, ua->ErrorMsg(_("Job \"%s\" is not running.\n"), ua->argv[i]); return NULL; } - store = jcr->impl->res.write_storage; + store = jcr->dir_impl->res.write_storage; FreeJcr(jcr); break; } @@ -1595,8 +1595,8 @@ alist<JobId_t*>* select_jobs(UaContext* ua, const char* reason) } if (jcr) { - if (jcr->impl->res.job - && !ua->AclAccessOk(Job_ACL, jcr->impl->res.job->resource_name_, + if (jcr->dir_impl->res.job + && !ua->AclAccessOk(Job_ACL, jcr->dir_impl->res.job->resource_name_, true)) { ua->ErrorMsg(_("Unauthorized command from this console.\n")); goto bail_out; @@ -1624,7 +1624,7 @@ alist<JobId_t*>* select_jobs(UaContext* ua, const char* reason) continue; } tjobs++; /* Count of all jobs */ - if (!ua->AclAccessOk(Job_ACL, jcr->impl->res.job->resource_name_)) { + if (!ua->AclAccessOk(Job_ACL, jcr->dir_impl->res.job->resource_name_)) { continue; /* Skip not authorized */ } njobs++; /* Count of authorized jobs */ @@ -1682,7 +1682,7 @@ alist<JobId_t*>* select_jobs(UaContext* ua, const char* reason) continue; } - if (!ua->AclAccessOk(Job_ACL, jcr->impl->res.job->resource_name_)) { + if (!ua->AclAccessOk(Job_ACL, jcr->dir_impl->res.job->resource_name_)) { continue; /* Skip not authorized */ } @@ -1739,7 +1739,7 @@ alist<JobId_t*>* select_jobs(UaContext* ua, const char* reason) if (jcr->JobId == 0) { /* This is us */ continue; } - if (!ua->AclAccessOk(Job_ACL, jcr->impl->res.job->resource_name_)) { + if (!ua->AclAccessOk(Job_ACL, jcr->dir_impl->res.job->resource_name_)) { continue; /* Skip not authorized */ } Bsnprintf(buf, sizeof(buf), _("JobId=%s Job=%s"), |