+/*
+ Bacula® - The Network Backup Solution
+
+ Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
+
+ The main author of Bacula is Kern Sibbald, with contributions from
+ many others, a complete list can be found in the file AUTHORS.
+ This program is Free Software; you can redistribute it and/or
+ modify it under the terms of version two of the GNU General Public
+ License as published by the Free Software Foundation plus additions
+ that are listed in the file LICENSE.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+
+ Bacula® is a registered trademark of John Walker.
+ The licensor of Bacula is the Free Software Foundation Europe
+ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+ Switzerland, email:ftf@fsfeurope.org.
+*/
/*
*
* Bacula Director -- User Agent Commands
*
* Version $Id$
*/
-/*
- Copyright (C) 2000-2006 Kern Sibbald
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- version 2 as amended with additional clauses defined in the
- file LICENSE in the main source directory.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- the file LICENSE for additional details.
-
- */
-
+
#include "bacula.h"
#include "dird.h"
{
unsigned int i;
int len, stat;
+ bool ok = false;
bool found = false;
+ BSOCK *user = ua->UA_sock;
stat = 1;
!acl_access_ok(ua, Command_ACL, ua->argk[0], len)) {
break;
}
- stat = (*commands[i].func)(ua, cmd); /* go execute command */
+ if (ua->api) user->signal(BNET_CMD_BEGIN);
+ ok = (*commands[i].func)(ua, cmd); /* go execute command */
found = true;
break;
}
}
if (!found) {
- bnet_fsend(ua->UA_sock, _("%s: is an illegal command.\n"), ua->argk[0]);
+ user->fsend(_("%s: is an invalid command.\n"), ua->argk[0]);
}
- return stat;
+ if (ua->api) user->signal(ok?BNET_CMD_OK:BNET_CMD_FAILED);
+ return ok;
}
/*
mr->Recycle = pr->Recycle;
mr->VolRetention = pr->VolRetention;
mr->VolUseDuration = pr->VolUseDuration;
+ mr->RecyclePoolId = pr->RecyclePoolId;
mr->MaxVolJobs = pr->MaxVolJobs;
mr->MaxVolFiles = pr->MaxVolFiles;
mr->MaxVolBytes = pr->MaxVolBytes;
STORE *store;
int Slot = 0, InChanger = 0;
- bsendmsg(ua, _(
+ ua->send_msg(_(
"You probably don't want to be using this command since it\n"
"creates database records without labeling the Volumes.\n"
"You probably want to use the \"label\" command.\n\n"));
- if (!open_db(ua)) {
+ if (!open_client_db(ua)) {
return 1;
}
pr.MaxVols, pr.PoolType);
while (pr.MaxVols > 0 && pr.NumVols >= pr.MaxVols) {
- bsendmsg(ua, _("Pool already has maximum volumes=%d\n"), pr.MaxVols);
+ ua->warning_msg(_("Pool already has maximum volumes=%d\n"), pr.MaxVols);
for (;;) {
if (!get_pint(ua, _("Enter new maximum (zero for unlimited): "))) {
return 1;
}
num = ua->pint32_val;
if (num < 0 || num > max) {
- bsendmsg(ua, _("The number must be between 0 and %d\n"), max);
+ ua->warning_msg(_("The number must be between 0 and %d\n"), max);
continue;
}
break;
goto getVolName;
}
if (strlen(ua->cmd) >= MAX_NAME_LENGTH-10) {
- bsendmsg(ua, _("Volume name too long.\n"));
+ ua->warning_msg(_("Volume name too long.\n"));
goto getVolName;
}
if (strlen(ua->cmd) == 0) {
- bsendmsg(ua, _("Volume name must be at least one character long.\n"));
+ ua->warning_msg(_("Volume name must be at least one character long.\n"));
goto getVolName;
}
}
startnum = ua->pint32_val;
if (startnum < 1) {
- bsendmsg(ua, _("Start number must be greater than zero.\n"));
+ ua->warning_msg(_("Start number must be greater than zero.\n"));
continue;
}
break;
mr.Enabled = 1;
Dmsg1(200, "Create Volume %s\n", mr.VolumeName);
if (!db_create_media_record(ua->jcr, ua->db, &mr)) {
- bsendmsg(ua, "%s", db_strerror(ua->db));
+ ua->error_msg("%s", db_strerror(ua->db));
return 1;
}
if (i == startnum) {
pr.NumVols += num;
Dmsg0(200, "Update pool record.\n");
if (db_update_pool_record(ua->jcr, ua->db, &pr) != 1) {
- bsendmsg(ua, "%s", db_strerror(ua->db));
+ ua->warning_msg("%s", db_strerror(ua->db));
return 1;
}
- bsendmsg(ua, _("%d Volumes created in pool %s\n"), num, pr.Name);
+ ua->send_msg(_("%d Volumes created in pool %s\n"), num, pr.Name);
return 1;
}
JCR *jcr = NULL;
char JobName[MAX_NAME_LENGTH];
- if (!open_db(ua)) {
- return 1;
- }
-
for (i=1; i<ua->argc; i++) {
if (strcasecmp(ua->argk[i], NT_("jobid")) == 0) {
uint32_t JobId;
}
JobId = str_to_int64(ua->argv[i]);
if (!(jcr=get_jcr_by_id(JobId))) {
- bsendmsg(ua, _("JobId %s is not running. Use Job name to cancel inactive jobs.\n"), ua->argv[i]);
+ ua->error_msg(_("JobId %s is not running. Use Job name to cancel inactive jobs.\n"), ua->argv[i]);
return 1;
}
break;
break;
}
if (!(jcr=get_jcr_by_partial_name(ua->argv[i]))) {
- bsendmsg(ua, _("Warning Job %s is not running. Continuing anyway ...\n"), ua->argv[i]);
+ ua->warning_msg(_("Warning Job %s is not running. Continuing anyway ...\n"), ua->argv[i]);
jcr = new_jcr(sizeof(JCR), dird_free_jcr);
bstrncpy(jcr->Job, ua->argv[i], sizeof(jcr->Job));
}
break;
}
if (!(jcr=get_jcr_by_full_name(ua->argv[i]))) {
- bsendmsg(ua, _("Warning Job %s is not running. Continuing anyway ...\n"), ua->argv[i]);
+ ua->warning_msg(_("Warning Job %s is not running. Continuing anyway ...\n"), ua->argv[i]);
jcr = new_jcr(sizeof(JCR), dird_free_jcr);
bstrncpy(jcr->Job, ua->argv[i], sizeof(jcr->Job));
}
}
}
- /* If we still do not have a jcr,
- * throw up a list and ask the user to select one.
- */
- if (!jcr) {
+ if (jcr) {
+ if (jcr->job && !acl_access_ok(ua, Job_ACL, jcr->job->name())) {
+ ua->error_msg(_("Unauthorized command from this console.\n"));
+ return 1;
+ }
+ } else {
+ /*
+ * If we still do not have a jcr,
+ * throw up a list and ask the user to select one.
+ */
char buf[1000];
+ int tjobs = 0; /* total # number jobs */
/* Count Jobs running */
foreach_jcr(jcr) {
if (jcr->JobId == 0) { /* this is us */
continue;
}
- njobs++;
+ tjobs++; /* count of all jobs */
+ if (!acl_access_ok(ua, Job_ACL, jcr->job->name())) {
+ continue; /* skip not authorized */
+ }
+ njobs++; /* count of authorized jobs */
}
endeach_jcr(jcr);
- if (njobs == 0) {
- bsendmsg(ua, _("No Jobs running.\n"));
+ if (njobs == 0) { /* no authorized */
+ if (tjobs == 0) {
+ ua->send_msg(_("No Jobs running.\n"));
+ } else {
+ ua->send_msg(_("None of your jobs are running.\n"));
+ }
return 1;
}
+
start_prompt(ua, _("Select Job:\n"));
foreach_jcr(jcr) {
char ed1[50];
if (jcr->JobId == 0) { /* this is us */
continue;
}
+ if (!acl_access_ok(ua, Job_ACL, jcr->job->name())) {
+ continue; /* skip not authorized */
+ }
bsnprintf(buf, sizeof(buf), _("JobId=%s Job=%s"), edit_int64(jcr->JobId, ed1), jcr->Job);
add_prompt(ua, buf);
}
sscanf(buf, "JobId=%d Job=%127s", &njobs, JobName);
jcr = get_jcr_by_full_name(JobName);
if (!jcr) {
- bsendmsg(ua, _("Job %s not found.\n"), JobName);
+ ua->warning_msg(_("Job \"%s\" not found.\n"), JobName);
return 1;
}
}
* the setting of MaxVols and NumVols slightly differently
* depending on if we are creating the Pool or we are
* simply bringing it into agreement with the resource (updage).
+ *
+ * Caution : RecyclePoolId isn't setup in this function.
+ * You can use set_pooldbr_recyclepoolid();
+ *
*/
void set_pooldbr_from_poolres(POOL_DBR *pr, POOL *pool, e_pool_op op)
{
}
}
+/* set/update Pool.RecyclePoolId in Catalog */
+int update_pool_recyclepool(JCR *jcr, B_DB *db, POOL *pool)
+{
+ POOL_DBR pr;
+
+ if (!pool->RecyclePool) {
+ return 1;
+ }
+
+ memset(&pr, 0, sizeof(POOL_DBR));
+ bstrncpy(pr.Name, pool->name(), sizeof(pr.Name));
+
+ if (!db_get_pool_record(jcr, db, &pr)) {
+ return -1; /* not exists in database */
+ }
+
+ set_pooldbr_from_poolres(&pr, pool, POOL_OP_UPDATE);
+
+ if (!set_pooldbr_recyclepoolid(jcr, db, &pr, pool)) {
+ return -1; /* error */
+ }
+
+ if (!db_update_pool_record(jcr, db, &pr)) {
+ return -1; /* error */
+ }
+ return 1;
+}
+
+/* set POOL_DBR.RecyclePoolId from Pool resource
+ * works with set_pooldbr_from_poolres
+ */
+bool set_pooldbr_recyclepoolid(JCR *jcr, B_DB *db, POOL_DBR *pr, POOL *pool)
+{
+ POOL_DBR rpool;
+ bool ret = true;
+
+ if (pool->RecyclePool) {
+ memset(&rpool, 0, sizeof(POOL_DBR));
+
+ bstrncpy(rpool.Name, pool->RecyclePool->name(), sizeof(rpool.Name));
+ if (db_get_pool_record(jcr, db, &rpool)) {
+ pr->RecyclePoolId = rpool.PoolId;
+ } else {
+ Jmsg(jcr, M_WARNING, 0,
+ _("Can't set %s RecyclePool to %s, %s is not in database.\n" \
+ "Try to update it with 'update pool=%s'\n"),
+ pool->name(), rpool.Name, rpool.Name,pool->name());
+
+ ret = false;
+ }
+ } else { /* no RecyclePool used, set it to 0 */
+ pr->RecyclePoolId = 0;
+ }
+ return ret;
+}
+
/*
* Create a pool record from a given Pool resource
memset(&pr, 0, sizeof(POOL_DBR));
- bstrncpy(pr.Name, pool->hdr.name, sizeof(pr.Name));
+ bstrncpy(pr.Name, pool->name(), sizeof(pr.Name));
if (db_get_pool_record(jcr, db, &pr)) {
/* Pool Exists */
{
POOL *pool;
- if (!open_db(ua)) {
+ if (!open_client_db(ua)) {
return 1;
}
switch (create_pool(ua->jcr, ua->db, pool, POOL_OP_CREATE)) {
case 0:
- bsendmsg(ua, _("Error: Pool %s already exists.\n"
- "Use update to change it.\n"), pool->hdr.name);
+ ua->error_msg(_("Error: Pool %s already exists.\n"
+ "Use update to change it.\n"), pool->name());
break;
case -1:
- bsendmsg(ua, "%s", db_strerror(ua->db));
+ ua->error_msg("%s", db_strerror(ua->db));
break;
default:
break;
}
- bsendmsg(ua, _("Pool %s created.\n"), pool->hdr.name);
+ ua->send_msg(_("Pool %s created.\n"), pool->name());
return 1;
}
*/
static int python_cmd(UAContext *ua, const char *cmd)
{
- if (ua->argc >= 1 && strcasecmp(ua->argk[1], NT_("restart")) == 0) {
+ if (ua->argc >= 2 && strcasecmp(ua->argk[1], NT_("restart")) == 0) {
term_python_interpreter();
- init_python_interpreter(director->hdr.name,
+ init_python_interpreter(director->name(),
director->scripts_directory, "DirStartUp");
- bsendmsg(ua, _("Python interpreter restarted.\n"));
+ ua->send_msg(_("Python interpreter restarted.\n"));
} else {
- bsendmsg(ua, _("Nothing done.\n"));
+ ua->warning_msg(_("Nothing done.\n"));
}
return 1;
}
{
CLIENT *client;
char buf[1024];
- if (!ua->cons || !acl_access_ok(ua, Client_ACL, ua->cons->hdr.name)) {
- bsendmsg(ua, _("Illegal command from this console.\n"));
+ if (!ua->cons || !acl_access_ok(ua, Client_ACL, ua->cons->name())) {
+ ua->error_msg(_("Unauthorized command from this console.\n"));
return 1;
}
LockRes();
- client = (CLIENT *)GetResWithName(R_CLIENT, ua->cons->hdr.name);
+ client = (CLIENT *)GetResWithName(R_CLIENT, ua->cons->name());
if (!client) {
- bsendmsg(ua, _("Client \"%s\" not found.\n"), ua->cons->hdr.name);
+ ua->error_msg(_("Client \"%s\" not found.\n"), ua->cons->name());
goto get_out;
}
if (client->address) {
/* MA Bug 6 remove ifdef */
sockaddr_to_ascii(&(ua->UA_sock->client_addr), buf, sizeof(buf));
client->address = bstrdup(buf);
- bsendmsg(ua, _("Client \"%s\" address set to %s\n"),
- client->hdr.name, client->address);
+ ua->send_msg(_("Client \"%s\" address set to %s\n"),
+ client->name(), client->address);
get_out:
UnlockRes();
return 1;
UnlockRes();
}
if (!job) {
- bsendmsg(ua, _("Job \"%s\" not found.\n"), ua->argv[i]);
+ ua->error_msg(_("Job \"%s\" not found.\n"), ua->argv[i]);
return;
}
- if (!acl_access_ok(ua, Job_ACL, job->hdr.name)) {
- bsendmsg(ua, _("Illegal command from this console.\n"));
+ if (!acl_access_ok(ua, Job_ACL, job->name())) {
+ ua->error_msg(_("Unauthorized command from this console.\n"));
return;
}
job->enabled = setting;
- bsendmsg(ua, _("Job \"%s\" %sabled\n"), job->hdr.name, setting?"en":"dis");
+ ua->send_msg(_("Job \"%s\" %sabled\n"), job->name(), setting?"en":"dis");
return;
}
{
BSOCK *sd;
JCR *jcr = ua->jcr;
-
- set_wstorage(jcr, store);
+ USTORE lstore;
+
+ lstore.store = store;
+ pm_strcpy(lstore.store_source, _("unknown source"));
+ set_wstorage(jcr, &lstore);
/* Try connecting for up to 15 seconds */
- bsendmsg(ua, _("Connecting to Storage daemon %s at %s:%d\n"),
+ ua->send_msg(_("Connecting to Storage daemon %s at %s:%d\n"),
store->name(), store->address, store->SDport);
if (!connect_to_storage_daemon(jcr, 1, 15, 0)) {
- bsendmsg(ua, _("Failed to connect to Storage daemon.\n"));
+ ua->error_msg(_("Failed to connect to Storage daemon.\n"));
return;
}
Dmsg0(120, _("Connected to storage daemon\n"));
sd = jcr->store_bsock;
bnet_fsend(sd, "setdebug=%d trace=%d\n", level, trace_flag);
if (bnet_recv(sd) >= 0) {
- bsendmsg(ua, "%s", sd->msg);
+ ua->send_msg("%s", sd->msg);
}
bnet_sig(sd, BNET_TERMINATE);
bnet_close(sd);
ua->jcr->client = client;
/* Try to connect for 15 seconds */
- bsendmsg(ua, _("Connecting to Client %s at %s:%d\n"),
- client->hdr.name, client->address, client->FDport);
+ ua->send_msg(_("Connecting to Client %s at %s:%d\n"),
+ client->name(), client->address, client->FDport);
if (!connect_to_file_daemon(ua->jcr, 1, 15, 0)) {
- bsendmsg(ua, _("Failed to connect to Client.\n"));
+ ua->error_msg(_("Failed to connect to Client.\n"));
return;
}
Dmsg0(120, "Connected to file daemon\n");
fd = ua->jcr->file_bsock;
bnet_fsend(fd, "setdebug=%d trace=%d\n", level, trace_flag);
if (bnet_recv(fd) >= 0) {
- bsendmsg(ua, "%s", fd->msg);
+ ua->send_msg("%s", fd->msg);
}
bnet_sig(fd, BNET_TERMINATE);
bnet_close(fd);
int trace_flag = -1;
int i;
- if (!open_db(ua)) {
+ if (!open_client_db(ua)) {
return 1;
}
Dmsg1(120, "setdebug:%s:\n", cmd);
POOLMEM *val = get_pool_memory(PM_FNAME);
char *var;
- if (!open_db(ua)) {
+ if (!open_client_db(ua)) {
return 1;
}
for (var=ua->cmd; *var != ' '; ) { /* skip command */
}
Dmsg1(100, "Var=%s:\n", var);
variable_expansion(ua->jcr, var, &val);
- bsendmsg(ua, "%s\n", val);
+ ua->send_msg("%s\n", val);
free_pool_memory(val);
return 1;
}
if (strcasecmp(ua->argk[i], NT_("job")) == 0) {
if (ua->argv[i]) {
job = (JOB *)GetResWithName(R_JOB, ua->argv[i]);
+ if (job && !acl_access_ok(ua, Job_ACL, job->name())) {
+ ua->error_msg(_("No authorization for Job \"%s\"\n"), job->name());
+ return 1;
+ }
continue;
}
}
if (strcasecmp(ua->argk[i], NT_("fileset")) == 0) {
if (ua->argv[i]) {
fileset = (FILESET *)GetResWithName(R_FILESET, ua->argv[i]);
+ if (fileset && !acl_access_ok(ua, FileSet_ACL, fileset->name())) {
+ ua->error_msg(_("No authorization for FileSet \"%s\"\n"), fileset->name());
+ return 1;
+ }
continue;
}
}
}
if (strcasecmp(ua->argk[i], NT_("level")) == 0) {
if (!get_level_from_name(ua->jcr, ua->argv[i])) {
- bsendmsg(ua, _("Level %s not valid.\n"), ua->argv[i]);
+ ua->error_msg(_("Level %s not valid.\n"), ua->argv[i]);
}
continue;
}
if (!job) {
job = (JOB *)GetResWithName(R_JOB, ua->argk[1]);
if (!job) {
- bsendmsg(ua, _("No job specified.\n"));
+ ua->error_msg(_("No job specified.\n"));
+ return 1;
+ }
+ if (!acl_access_ok(ua, Job_ACL, job->name())) {
+ ua->error_msg(_("No authorization for Job \"%s\"\n"), job->name());
return 1;
}
}
get_level_since_time(ua->jcr, since, sizeof(since));
- bsendmsg(ua, _("Connecting to Client %s at %s:%d\n"),
- job->client->hdr.name, job->client->address, job->client->FDport);
+ ua->send_msg(_("Connecting to Client %s at %s:%d\n"),
+ job->client->name(), job->client->address, job->client->FDport);
if (!connect_to_file_daemon(jcr, 1, 15, 0)) {
- bsendmsg(ua, _("Failed to connect to Client.\n"));
+ ua->error_msg(_("Failed to connect to Client.\n"));
return 1;
}
if (!send_include_list(jcr)) {
- bsendmsg(ua, _("Error sending include list.\n"));
+ ua->error_msg(_("Error sending include list.\n"));
goto bail_out;
}
if (!send_exclude_list(jcr)) {
- bsendmsg(ua, _("Error sending exclude list.\n"));
+ ua->error_msg(_("Error sending exclude list.\n"));
goto bail_out;
}
bnet_fsend(jcr->file_bsock, "estimate listing=%d\n", listing);
while (bnet_recv(jcr->file_bsock) >= 0) {
- bsendmsg(ua, "%s", jcr->file_bsock->msg);
+ ua->send_msg("%s", jcr->file_bsock->msg);
}
bail_out:
struct tm tm;
(void)localtime_r(&ttime, &tm);
strftime(sdt, sizeof(sdt), "%d-%b-%Y %H:%M:%S", &tm);
- bsendmsg(ua, "%s\n", sdt);
+ ua->send_msg("%s\n", sdt);
return 1;
}
NT_("jobid"),
NULL};
- if (!open_db(ua)) {
+ if (!open_client_db(ua)) {
return 1;
}
break;
}
- bsendmsg(ua, _(
+ ua->warning_msg(_(
"In general it is not a good idea to delete either a\n"
"Pool or a Volume since they may contain data.\n\n"));
delete_job(ua);
return 1;
default:
- bsendmsg(ua, _("Nothing done.\n"));
+ ua->warning_msg(_("Nothing done.\n"));
break;
}
return 1;
/*
* do_job_delete now performs the actual delete operation atomically
*/
-
static void do_job_delete(UAContext *ua, JobId_t JobId)
{
- POOL_MEM query(PM_MESSAGE);
char ed1[50];
- purge_files_from_job(ua, JobId);
- purge_job_from_catalog(ua, JobId);
- bsendmsg(ua, _("Job %s and associated records deleted from the catalog.\n"), edit_int64(JobId, ed1));
+ edit_int64(JobId, ed1);
+ purge_jobs_from_catalog(ua, ed1);
+ ua->send_msg(_("Job %s and associated records deleted from the catalog.\n"), ed1);
}
/*
if (!select_media_dbr(ua, &mr)) {
return 1;
}
- bsendmsg(ua, _("\nThis command will delete volume %s\n"
+ ua->warning_msg(_("\nThis command will delete volume %s\n"
"and all Jobs saved on that volume from the Catalog\n"),
mr.VolumeName);
static void do_mount_cmd(UAContext *ua, const char *command)
{
- STORE *store;
+ USTORE store;
BSOCK *sd;
JCR *jcr = ua->jcr;
char dev_name[MAX_NAME_LENGTH];
int drive;
int slot = -1;
- if (!open_db(ua)) {
+ if (!open_client_db(ua)) {
return;
}
Dmsg2(120, "%s: %s\n", command, ua->UA_sock->msg);
- store = get_storage_resource(ua, true/*arg is storage*/);
- if (!store) {
+ store.store = get_storage_resource(ua, true/*arg is storage*/);
+ pm_strcpy(store.store_source, _("unknown source"));
+ if (!store.store) {
return;
}
- set_wstorage(jcr, store);
- drive = get_storage_drive(ua, store);
+ set_wstorage(jcr, &store);
+ drive = get_storage_drive(ua, store.store);
if (strcmp(command, "mount") == 0) {
- slot = get_storage_slot(ua, store);
+ slot = get_storage_slot(ua, store.store);
}
Dmsg3(120, "Found storage, MediaType=%s DevName=%s drive=%d\n",
- store->media_type, store->dev_name(), drive);
+ store.store->media_type, store.store->dev_name(), drive);
if (!connect_to_storage_daemon(jcr, 10, SDConnectTimeout, 1)) {
- bsendmsg(ua, _("Failed to connect to Storage daemon.\n"));
+ ua->error_msg(_("Failed to connect to Storage daemon.\n"));
return;
}
sd = jcr->store_bsock;
- bstrncpy(dev_name, store->dev_name(), sizeof(dev_name));
+ bstrncpy(dev_name, store.store->dev_name(), sizeof(dev_name));
bash_spaces(dev_name);
if (slot > 0) {
bnet_fsend(sd, "%s %s drive=%d slot=%d", command, dev_name, drive, slot);
bnet_fsend(sd, "%s %s drive=%d", command, dev_name, drive);
}
while (bnet_recv(sd) >= 0) {
- bsendmsg(ua, "%s", sd->msg);
+ ua->send_msg("%s", sd->msg);
}
bnet_sig(sd, BNET_TERMINATE);
bnet_close(sd);
ua->catalog = catalog;
}
if (open_db(ua)) {
- bsendmsg(ua, _("Using Catalog name=%s DB=%s\n"),
- ua->catalog->hdr.name, ua->catalog->db_name);
+ ua->send_msg(_("Using Catalog name=%s DB=%s\n"),
+ ua->catalog->name(), ua->catalog->db_name);
}
return 1;
}
int quit_cmd(UAContext *ua, const char *cmd)
{
- ua->quit = TRUE;
+ ua->quit = true;
return 1;
}
uint32_t jobid = 0 ;
- if (!open_db(ua)) {
- bsendmsg(ua, _("ERR: Can't open db\n")) ;
+ if (!open_client_db(ua)) {
+ ua->error_msg(_("ERR: Can't open db\n")) ;
return 1;
}
}
if (jobid == 0) {
- bsendmsg(ua, _("ERR: Job was not found\n"));
+ ua->error_msg(_("ERR: Job was not found\n"));
return 1 ;
}
break;
}
- bsendmsg(ua, "JobId=%i\n", jobid) ;
- bsendmsg(ua, "JobStatus=%s (%c)\n",
+ ua->send_msg("JobId=%i\n", jobid) ;
+ ua->send_msg("JobStatus=%s (%c)\n",
job_status_to_str(jobstatus),
jobstatus) ;
- if (ua->gui) {
- bsendmsg(ua, "ExitStatus=%i\n", status) ;
+ if (ua->gui || ua->api) {
+ ua->send_msg("ExitStatus=%i\n", status) ;
}
return 1;
{
unsigned int i;
- bsendmsg(ua, _(" Command Description\n ======= ===========\n"));
+ ua->send_msg(_(" Command Description\n ======= ===========\n"));
for (i=0; i<comsize; i++) {
- bsendmsg(ua, _(" %-10s %s\n"), _(commands[i].key), _(commands[i].help));
+ ua->send_msg(_(" %-10s %s\n"), _(commands[i].key), _(commands[i].help));
}
- bsendmsg(ua, _("\nWhen at a prompt, entering a period cancels the command.\n\n"));
+ ua->send_msg(_("\nWhen at a prompt, entering a period cancels the command.\n\n"));
return 1;
}
unsigned int i;
for (i=0; i<comsize; i++) {
- bsendmsg(ua, "%s %s\n", commands[i].key, _(commands[i].help));
+ ua->send_msg("%s %s\n", commands[i].key, _(commands[i].help));
}
return 1;
}
static int version_cmd(UAContext *ua, const char *cmd)
{
- bsendmsg(ua, _("%s Version: %s (%s)\n"), my_name, VERSION, BDATE);
+ ua->send_msg(_("%s Version: %s (%s) %s %s %s\n"), my_name, VERSION, BDATE,
+ HOST_OS, DISTNAME, DISTVER);
return 1;
}
+/*
+ * This call explicitly checks for a catalog=xxx and
+ * if given, opens that catalog. It also checks for
+ * client=xxx and if found, opens the catalog
+ * corresponding to that client. If we still don't
+ * have a catalog, look for a Job keyword and get the
+ * catalog from its client record.
+ */
+bool open_client_db(UAContext *ua)
+{
+ int i;
+ CAT *catalog;
+ CLIENT *client;
+ JOB *job;
+
+ /* Try for catalog keyword */
+ i = find_arg_with_value(ua, NT_("catalog"));
+ if (i >= 0) {
+ if (!acl_access_ok(ua, Catalog_ACL, ua->argv[i])) {
+ ua->error_msg(_("No authorization for Catalog \"%s\"\n"), ua->argv[i]);
+ return false;
+ }
+ catalog = (CAT *)GetResWithName(R_CATALOG, ua->argv[i]);
+ if (catalog) {
+ if (ua->catalog && ua->catalog != catalog) {
+ close_db(ua);
+ }
+ ua->catalog = catalog;
+ return open_db(ua);
+ }
+ }
+
+ /* Try for client keyword */
+ i = find_arg_with_value(ua, NT_("client"));
+ if (i >= 0) {
+ if (!acl_access_ok(ua, Client_ACL, ua->argv[i])) {
+ ua->error_msg(_("No authorization for Client \"%s\"\n"), ua->argv[i]);
+ return false;
+ }
+ client = (CLIENT *)GetResWithName(R_CLIENT, ua->argv[i]);
+ if (client) {
+ catalog = client->catalog;
+ if (ua->catalog && ua->catalog != catalog) {
+ close_db(ua);
+ }
+ if (!acl_access_ok(ua, Catalog_ACL, catalog->name())) {
+ ua->error_msg(_("No authorization for Catalog \"%s\"\n"), catalog->name());
+ return false;
+ }
+ ua->catalog = catalog;
+ return open_db(ua);
+ }
+ }
+
+ /* Try for Job keyword */
+ i = find_arg_with_value(ua, NT_("job"));
+ if (i >= 0) {
+ if (!acl_access_ok(ua, Job_ACL, ua->argv[i])) {
+ ua->error_msg(_("No authorization for Job \"%s\"\n"), ua->argv[i]);
+ return false;
+ }
+ job = (JOB *)GetResWithName(R_JOB, ua->argv[i]);
+ if (job) {
+ catalog = job->client->catalog;
+ if (ua->catalog && ua->catalog != catalog) {
+ close_db(ua);
+ }
+ if (!acl_access_ok(ua, Catalog_ACL, catalog->name())) {
+ ua->error_msg(_("No authorization for Catalog \"%s\"\n"), catalog->name());
+ return false;
+ }
+ ua->catalog = catalog;
+ return open_db(ua);
+ }
+ }
+
+ return open_db(ua);
+}
+
/*
* Open the catalog database.
if (!ua->catalog) {
ua->catalog = get_catalog_resource(ua);
if (!ua->catalog) {
- bsendmsg(ua, _("Could not find a Catalog resource\n"));
+ ua->error_msg( _("Could not find a Catalog resource\n"));
return false;
}
}
ua->catalog->db_port, ua->catalog->db_socket,
ua->catalog->mult_db_connections);
if (!ua->db || !db_open_database(ua->jcr, ua->db)) {
- bsendmsg(ua, _("Could not open database \"%s\".\n"),
+ ua->error_msg(_("Could not open catalog database \"%s\".\n"),
ua->catalog->db_name);
if (ua->db) {
- bsendmsg(ua, "%s", db_strerror(ua->db));
+ ua->error_msg("%s", db_strerror(ua->db));
}
close_db(ua);
return false;
}
ua->jcr->db = ua->db;
+ if (!ua->api) {
+ ua->send_msg(_("Using Catalog \"%s\"\n"), ua->catalog->name());
+ }
Dmsg1(150, "DB %s opened\n", ua->catalog->db_name);
return true;
}