X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fua_cmds.c;h=c8db5126ad6c5382e79b254cc5e5840acd054b5e;hb=a3ba5d75054ef1a4566ef544e042b8c7cfd6ac9b;hp=1751c61c5bb26bf269b8777ca31b8028057f71b8;hpb=62e02d8bf7e270ea51323bbd2b7be39576cf5c91;p=bacula%2Fbacula diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c index 1751c61c5b..c8db5126ad 100644 --- a/bacula/src/dird/ua_cmds.c +++ b/bacula/src/dird/ua_cmds.c @@ -1,3 +1,30 @@ +/* + Bacula® - The Network Backup Solution + + Copyright (C) 2000-2008 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 and included + 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 Kern Sibbald. + 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 @@ -6,191 +33,202 @@ * * Version $Id$ */ + +#include "bacula.h" +#include "dird.h" -/* - Copyright (C) 2000-2004 Kern Sibbald and John Walker - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of - the License, or (at your option) any later version. +#ifdef HAVE_PYTHON - 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. +#undef _POSIX_C_SOURCE +#include - 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., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA. +#include "lib/pythonlib.h" - */ +/* Imported Functions */ +extern PyObject *job_getattr(PyObject *self, char *attrname); +extern int job_setattr(PyObject *self, char *attrname, PyObject *value); -#include "bacula.h" -#include "dird.h" +#endif /* HAVE_PYTHON */ /* Imported subroutines */ /* Imported variables */ -extern int r_first; -extern int r_last; -extern struct s_res resources[]; -extern char my_name[]; -extern jobq_t job_queue; /* job queue */ - +extern jobq_t job_queue; /* job queue */ -extern char *list_pool; /* Imported functions */ -extern int status_cmd(UAContext *ua, const char *cmd); +extern int autodisplay_cmd(UAContext *ua, const char *cmd); +extern int gui_cmd(UAContext *ua, const char *cmd); +extern int label_cmd(UAContext *ua, const char *cmd); extern int list_cmd(UAContext *ua, const char *cmd); extern int llist_cmd(UAContext *ua, const char *cmd); -extern int show_cmd(UAContext *ua, const char *cmd); extern int messagescmd(UAContext *ua, const char *cmd); -extern int autodisplay_cmd(UAContext *ua, const char *cmd); -extern int gui_cmd(UAContext *ua, const char *cmd); -extern int sqlquerycmd(UAContext *ua, const char *cmd); -extern int querycmd(UAContext *ua, const char *cmd); -extern int run_cmd(UAContext *ua, const char *cmd); -extern int retentioncmd(UAContext *ua, const char *cmd); extern int prunecmd(UAContext *ua, const char *cmd); extern int purgecmd(UAContext *ua, const char *cmd); -extern int restore_cmd(UAContext *ua, const char *cmd); -extern int label_cmd(UAContext *ua, const char *cmd); +extern int querycmd(UAContext *ua, const char *cmd); extern int relabel_cmd(UAContext *ua, const char *cmd); -extern int update_slots(UAContext *ua); /* ua_label.c */ +extern int restore_cmd(UAContext *ua, const char *cmd); +extern int retentioncmd(UAContext *ua, const char *cmd); +extern int show_cmd(UAContext *ua, const char *cmd); +extern int sqlquerycmd(UAContext *ua, const char *cmd); +extern int status_cmd(UAContext *ua, const char *cmd); +extern int update_cmd(UAContext *ua, const char *cmd); /* Forward referenced functions */ -static int add_cmd(UAContext *ua, const char *cmd); -static int create_cmd(UAContext *ua, const char *cmd); -static int cancel_cmd(UAContext *ua, const char *cmd); -static int setdebug_cmd(UAContext *ua, const char *cmd); -static int trace_cmd(UAContext *ua, const char *cmd); -static int var_cmd(UAContext *ua, const char *cmd); +static int add_cmd(UAContext *ua, const char *cmd); +static int automount_cmd(UAContext *ua, const char *cmd); +static int cancel_cmd(UAContext *ua, const char *cmd); +static int create_cmd(UAContext *ua, const char *cmd); +static int delete_cmd(UAContext *ua, const char *cmd); +static int disable_cmd(UAContext *ua, const char *cmd); +static int enable_cmd(UAContext *ua, const char *cmd); static int estimate_cmd(UAContext *ua, const char *cmd); static int help_cmd(UAContext *ua, const char *cmd); -static int delete_cmd(UAContext *ua, const char *cmd); -static int use_cmd(UAContext *ua, const char *cmd); -static int unmount_cmd(UAContext *ua, const char *cmd); -static int version_cmd(UAContext *ua, const char *cmd); -static int automount_cmd(UAContext *ua, const char *cmd); -static int time_cmd(UAContext *ua, const char *cmd); -static int reload_cmd(UAContext *ua, const char *cmd); -static int update_volume(UAContext *ua); -static int update_pool(UAContext *ua); -static int delete_volume(UAContext *ua); -static int delete_pool(UAContext *ua); -static void delete_job(UAContext *ua); +static int memory_cmd(UAContext *ua, const char *cmd); static int mount_cmd(UAContext *ua, const char *cmd); +static int python_cmd(UAContext *ua, const char *cmd); static int release_cmd(UAContext *ua, const char *cmd); -static int update_cmd(UAContext *ua, const char *cmd); -static int wait_cmd(UAContext *ua, const char *cmd); +static int reload_cmd(UAContext *ua, const char *cmd); +static int setdebug_cmd(UAContext *ua, const char *cmd); static int setip_cmd(UAContext *ua, const char *cmd); +static int time_cmd(UAContext *ua, const char *cmd); +static int trace_cmd(UAContext *ua, const char *cmd); +static int unmount_cmd(UAContext *ua, const char *cmd); +static int use_cmd(UAContext *ua, const char *cmd); +static int var_cmd(UAContext *ua, const char *cmd); +static int version_cmd(UAContext *ua, const char *cmd); +static int wait_cmd(UAContext *ua, const char *cmd); + static void do_job_delete(UAContext *ua, JobId_t JobId); static void delete_job_id_range(UAContext *ua, char *tok); +static int delete_volume(UAContext *ua); +static int delete_pool(UAContext *ua); +static void delete_job(UAContext *ua); int qhelp_cmd(UAContext *ua, const char *cmd); int quit_cmd(UAContext *ua, const char *cmd); -struct cmdstruct { const char *key; int (*func)(UAContext *ua, const char *cmd); const char *help; }; -static struct cmdstruct commands[] = { - { N_("add"), add_cmd, _("add media to a pool")}, - { N_("autodisplay"), autodisplay_cmd, _("autodisplay [on/off] -- console messages")}, - { N_("automount"), automount_cmd, _("automount [on/off] -- after label")}, - { N_("cancel"), cancel_cmd, _("cancel job=nnn -- cancel a job")}, - { N_("create"), create_cmd, _("create DB Pool from resource")}, - { N_("delete"), delete_cmd, _("delete [pool= | media volume=]")}, - { N_("estimate"), estimate_cmd, _("performs FileSet estimate, listing gives full listing")}, - { N_("exit"), quit_cmd, _("exit = quit")}, - { N_("gui"), gui_cmd, _("gui [on/off] -- non-interactive gui mode")}, - { N_("help"), help_cmd, _("print this command")}, - { N_("list"), list_cmd, _("list [pools | jobs | jobtotals | media | files jobid=]; from catalog")}, - { N_("label"), label_cmd, _("label a tape")}, - { N_("llist"), llist_cmd, _("full or long list like list command")}, - { N_("messages"), messagescmd, _("messages")}, - { N_("mount"), mount_cmd, _("mount ")}, - { N_("prune"), prunecmd, _("prune expired records from catalog")}, - { N_("purge"), purgecmd, _("purge records from catalog")}, - { N_("quit"), quit_cmd, _("quit")}, - { N_("query"), querycmd, _("query catalog")}, - { N_("restore"), restore_cmd, _("restore files")}, - { N_("relabel"), relabel_cmd, _("relabel a tape")}, - { N_("release"), release_cmd, _("release ")}, - { N_("reload"), reload_cmd, _("reload conf file")}, - { N_("run"), run_cmd, _("run ")}, - { N_("status"), status_cmd, _("status [storage | client]=")}, - { N_("setdebug"), setdebug_cmd, _("sets debug level")}, - { N_("setip"), setip_cmd, _("sets new client address -- if authorized")}, - { N_("show"), show_cmd, _("show (resource records) [jobs | pools | ... | all]")}, - { N_("sqlquery"), sqlquerycmd, _("use SQL to query catalog")}, - { N_("time"), time_cmd, _("print current time")}, - { N_("trace"), trace_cmd, _("turn on/off trace to file")}, - { N_("unmount"), unmount_cmd, _("unmount ")}, - { N_("update"), update_cmd, _("update Volume or Pool")}, - { N_("use"), use_cmd, _("use catalog xxx")}, - { N_("var"), var_cmd, _("does variable expansion")}, - { N_("version"), version_cmd, _("print Director version")}, - { N_("wait"), wait_cmd, _("wait until no jobs are running")}, - }; +struct cmdstruct { const char *key; int (*func)(UAContext *ua, const char *cmd); const char *help; const bool use_in_rs;}; +static struct cmdstruct commands[] = { /* Can use it in Console RunScript*/ + { NT_("add"), add_cmd, _("[pool= storage= jobid=] -- add media to a pool"), false}, + { NT_("autodisplay"), autodisplay_cmd, _("autodisplay [on|off] -- console messages"),false}, + { NT_("automount"), automount_cmd, _("automount [on|off] -- after label"), false}, + { NT_("cancel"), cancel_cmd, _("cancel [jobid= job= ujobid=] -- cancel a job"), false}, + { NT_("create"), create_cmd, _("create [pool=] -- create DB Pool from resource"), false}, + { NT_("delete"), delete_cmd, _("delete [volume= pool= job jobid=]"), true}, + { NT_("disable"), disable_cmd, _("disable -- disable a job"), true}, + { NT_("enable"), enable_cmd, _("enable -- enable a job"), true}, + { NT_("estimate"), estimate_cmd, _("performs FileSet estimate, listing gives full listing"), true}, + { NT_("exit"), quit_cmd, _("exit = quit"), false}, + { NT_("gui"), gui_cmd, _("gui [on|off] -- non-interactive gui mode"), false}, + { NT_("help"), help_cmd, _("print this command"), false}, + { NT_("label"), label_cmd, _("label a tape"), false}, + { NT_("list"), list_cmd, _("list [pools | jobs | jobtotals | media | files | copies ]; from catalog"), true}, + { NT_("llist"), llist_cmd, _("full or long list like list command"), true}, + { NT_("memory"), memory_cmd, _("print current memory usage"), true}, + { NT_("messages"), messagescmd, _("messages"), false}, + { NT_("mount"), mount_cmd, _("mount storage= [ slot= ] [ drive= ] or mount [ jobid= | job= ]"), false}, + { NT_("prune"), prunecmd, _("files|jobs|volume client= volume= prune expired records from catalog"), true}, + { NT_("purge"), purgecmd, _("purge records from catalog"), true}, + { NT_("python"), python_cmd, _("python control commands"), false}, + { NT_("quit"), quit_cmd, _("quit"), false}, + { NT_("query"), querycmd, _("query catalog"), false}, + { NT_("restore"), restore_cmd, _("restore files"), false}, + { NT_("relabel"), relabel_cmd, _("relabel storage= oldvolume= volume= -- relabel a tape"), false}, + { NT_("release"), release_cmd, _("release "), false}, + { NT_("reload"), reload_cmd, _("reload conf file"), true}, + { NT_("run"), run_cmd, _("run job= client= fileset= level= storage= where= when= yes"), false}, /* need to be check */ + { NT_("setdebug"), setdebug_cmd, _("setdebug level=nn [trace=0/1 client= | dir | director | storage= | all] -- sets debug level"), true}, + { NT_("setip"), setip_cmd, _("sets new client address -- if authorized"), false}, + { NT_("show"), show_cmd, _("show (resource records) [jobs | pools | ... | all]"), true}, + { NT_("status"), status_cmd, _("status [all | dir= | director | client= | storage= | days=nnn]"), true}, + { NT_("sqlquery"), sqlquerycmd, _("use SQL to query catalog"), false}, + { NT_("time"), time_cmd, _("print current time"), true}, + { NT_("trace"), trace_cmd, _("turn on/off trace to file"), true}, + { NT_("unmount"), unmount_cmd, _("unmount storage= [ drive= ] or unmount [ jobid= | job= ]"), false}, + { NT_("umount"), unmount_cmd, _("umount - for old-time Unix guys, see unmount"),false}, + { NT_("update"), update_cmd, _("update Volume, Pool or slots"), true}, + { NT_("use"), use_cmd, _("use -- catalog xxx"), false}, + { NT_("var"), var_cmd, _("does variable expansion"), false}, + { NT_("version"), version_cmd, _("print Director version"), true}, + { NT_("wait"), wait_cmd, _("wait [ | | ] -- wait until no jobs are running"), false}, + }; #define comsize (sizeof(commands)/sizeof(struct cmdstruct)) /* * Execute a command from the UA */ -int do_a_command(UAContext *ua, const char *cmd) +bool do_a_command(UAContext *ua) { unsigned int i; - int len, stat; + int len; + bool ok = false; bool found = false; + BSOCK *user = ua->UA_sock; - stat = 1; - Dmsg1(200, "Command: %s\n", ua->UA_sock->msg); + Dmsg1(900, "Command: %s\n", ua->argk[0]); if (ua->argc == 0) { - return 1; + return false; + } + + while (ua->jcr->wstorage->size()) { + ua->jcr->wstorage->remove(0); } len = strlen(ua->argk[0]); - for (i=0; iargk[0], _(commands[i].key), len) == 0) { - if (!acl_access_ok(ua, Command_ACL, ua->argk[0], len)) { - break; - } - stat = (*commands[i].func)(ua, cmd); /* go execute command */ - found = true; - break; + for (i=0; iargk[0], commands[i].key, len) == 0) { + /* Check if command permitted, but "quit" is always OK */ + if (strcmp(ua->argk[0], NT_("quit")) != 0 && + !acl_access_ok(ua, Command_ACL, ua->argk[0], len)) { + break; + } + /* Check if this command is authorized in RunScript */ + if (ua->runscript && !commands[i].use_in_rs) { + ua->error_msg(_("Can't use %s command in a runscript"), ua->argk[0]); + break; + } + if (ua->api) user->signal(BNET_CMD_BEGIN); + ok = (*commands[i].func)(ua, ua->cmd); /* go execute command */ + found = true; + break; } } if (!found) { - bnet_fsend(ua->UA_sock, _("%s: is an illegal command.\n"), ua->argk[0]); + ua->error_msg(_("%s: is an invalid command.\n"), ua->argk[0]); + ok = false; } - return stat; + if (ua->api) user->signal(ok?BNET_CMD_OK:BNET_CMD_FAILED); + return ok; } /* * This is a common routine used to stuff the Pool DB record defaults - * into the Media DB record just before creating a media (Volume) + * into the Media DB record just before creating a media (Volume) * record. */ void set_pool_dbr_defaults_in_media_dbr(MEDIA_DBR *mr, POOL_DBR *pr) { mr->PoolId = pr->PoolId; - bstrncpy(mr->VolStatus, "Append", sizeof(mr->VolStatus)); + bstrncpy(mr->VolStatus, NT_("Append"), sizeof(mr->VolStatus)); 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; + mr->LabelType = pr->LabelType; + mr->Enabled = 1; } /* * Add Volumes to an existing Pool */ -static int add_cmd(UAContext *ua, const char *cmd) +static int add_cmd(UAContext *ua, const char *cmd) { POOL_DBR pr; MEDIA_DBR mr; @@ -200,12 +238,12 @@ static int add_cmd(UAContext *ua, const char *cmd) 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; } @@ -220,77 +258,78 @@ static int add_cmd(UAContext *ua, const char *cmd) pr.MaxVols, pr.PoolType); while (pr.MaxVols > 0 && pr.NumVols >= pr.MaxVols) { - bsendmsg(ua, _("Pool already has maximum volumes = %d\n"), pr.MaxVols); - for (;;) { - if (!get_pint(ua, _("Enter new maximum (zero for unlimited): "))) { - return 1; - } - pr.MaxVols = ua->pint32_val; + ua->warning_msg(_("Pool already has maximum volumes=%d\n"), pr.MaxVols); + if (!get_pint(ua, _("Enter new maximum (zero for unlimited): "))) { + return 1; } + pr.MaxVols = ua->pint32_val; } /* Get media type */ - if ((store = get_storage_resource(ua, 0)) != NULL) { + if ((store = get_storage_resource(ua, false/*no default*/)) != NULL) { bstrncpy(mr.MediaType, store->media_type, sizeof(mr.MediaType)); } else if (!get_media_type(ua, mr.MediaType, sizeof(mr.MediaType))) { return 1; } - + if (pr.MaxVols == 0) { max = 1000; } else { max = pr.MaxVols - pr.NumVols; } for (;;) { - char buf[100]; + char buf[100]; bsnprintf(buf, sizeof(buf), _("Enter number of Volumes to create. 0=>fixed name. Max=%d: "), max); if (!get_pint(ua, buf)) { - return 1; + return 1; } num = ua->pint32_val; if (num < 0 || num > max) { - bsendmsg(ua, _("The number must be between 0 and %d\n"), max); - continue; + ua->warning_msg(_("The number must be between 0 and %d\n"), max); + continue; } break; } -getVolName: - if (num == 0) { - if (!get_cmd(ua, _("Enter Volume name: "))) { - return 1; + + for (;;) { + if (num == 0) { + if (!get_cmd(ua, _("Enter Volume name: "))) { + return 1; + } + } else { + if (!get_cmd(ua, _("Enter base volume name: "))) { + return 1; + } } - } else { - if (!get_cmd(ua, _("Enter base volume name: "))) { - return 1; + /* Don't allow | in Volume name because it is the volume separator character */ + if (!is_volume_name_legal(ua, ua->cmd)) { + continue; } - } - /* Don't allow | in Volume name because it is the volume separator character */ - if (!is_volume_name_legal(ua, ua->cmd)) { - goto getVolName; - } - if (strlen(ua->cmd) >= MAX_NAME_LENGTH-10) { - bsendmsg(ua, _("Volume name too long.\n")); - goto getVolName; - } - if (strlen(ua->cmd) == 0) { - bsendmsg(ua, _("Volume name must be at least one character long.\n")); - goto getVolName; + if (strlen(ua->cmd) >= MAX_NAME_LENGTH-10) { + ua->warning_msg(_("Volume name too long.\n")); + continue; + } + if (strlen(ua->cmd) == 0) { + ua->warning_msg(_("Volume name must be at least one character long.\n")); + continue; + } + break; } bstrncpy(name, ua->cmd, sizeof(name)); if (num > 0) { - strcat(name, "%04d"); + bstrncat(name, "%04d", sizeof(name)); for (;;) { if (!get_pint(ua, _("Enter the starting number: "))) { - return 1; - } - startnum = ua->pint32_val; - if (startnum < 1) { - bsendmsg(ua, _("Start number must be greater than zero.\n")); - continue; - } - break; + return 1; + } + startnum = ua->pint32_val; + if (startnum < 1) { + ua->warning_msg(_("Start number must be greater than zero.\n")); + continue; + } + break; } } else { startnum = 1; @@ -299,44 +338,46 @@ getVolName: if (store && store->autochanger) { if (!get_pint(ua, _("Enter slot (0 for none): "))) { - return 1; + return 1; } Slot = ua->pint32_val; if (!get_yesno(ua, _("InChanger? yes/no: "))) { - return 1; + return 1; } InChanger = ua->pint32_val; } - + set_pool_dbr_defaults_in_media_dbr(&mr, &pr); - for (i=startnum; i < num+startnum; i++) { + for (i=startnum; i < num+startnum; i++) { bsnprintf(mr.VolumeName, sizeof(mr.VolumeName), name, i); mr.Slot = Slot++; mr.InChanger = InChanger; + mr.StorageId = store->StorageId; + 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)); - return 1; + ua->error_msg("%s", db_strerror(ua->db)); + return 1; } if (i == startnum) { - first_id = mr.PoolId; + first_id = mr.PoolId; } } pr.NumVols += num; - Dmsg0(200, "Update pool record.\n"); + 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; } /* - * Turn auto mount on/off - * - * automount on + * Turn auto mount on/off + * + * automount on * automount off */ int automount_cmd(UAContext *ua, const char *cmd) @@ -345,15 +386,15 @@ int automount_cmd(UAContext *ua, const char *cmd) if (ua->argc != 2) { if (!get_cmd(ua, _("Turn on or off? "))) { - return 1; + return 1; } onoff = ua->cmd; } else { onoff = ua->argk[1]; } - ua->automount = (strcasecmp(onoff, _("off")) == 0) ? 0 : 1; - return 1; + ua->automount = (strcasecmp(onoff, NT_("off")) == 0) ? 0 : 1; + return 1; } @@ -367,84 +408,116 @@ static int cancel_cmd(UAContext *ua, const char *cmd) JCR *jcr = NULL; char JobName[MAX_NAME_LENGTH]; - if (!open_db(ua)) { - return 1; - } - for (i=1; iargc; i++) { - if (strcasecmp(ua->argk[i], _("jobid")) == 0) { - uint32_t JobId; - if (!ua->argv[i]) { - break; - } - JobId = str_to_int64(ua->argv[i]); - if (!(jcr=get_jcr_by_id(JobId))) { - bsendmsg(ua, _("JobId %d is not running.\n"), JobId); - return 1; - } - break; - } else if (strcasecmp(ua->argk[i], _("job")) == 0) { - if (!ua->argv[i]) { - break; - } - if (!(jcr=get_jcr_by_partial_name(ua->argv[i]))) { - bsendmsg(ua, _("Job %s is not running.\n"), ua->argv[i]); - return 1; - } - break; - } - } - /* If we still do not have a jcr, - * throw up a list and ask the user to select one. - */ - if (!jcr) { + if (strcasecmp(ua->argk[i], NT_("jobid")) == 0) { + uint32_t JobId; + if (!ua->argv[i]) { + break; + } + JobId = str_to_int64(ua->argv[i]); + if (!(jcr=get_jcr_by_id(JobId))) { + ua->error_msg(_("JobId %s is not running. Use Job name to cancel inactive jobs.\n"), ua->argv[i]); + return 1; + } + break; + } else if (strcasecmp(ua->argk[i], NT_("job")) == 0) { + if (!ua->argv[i]) { + break; + } + if (!(jcr=get_jcr_by_partial_name(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; + } else if (strcasecmp(ua->argk[i], NT_("ujobid")) == 0) { + if (!ua->argv[i]) { + break; + } + if (!(jcr=get_jcr_by_full_name(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) { + 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 */ - lock_jcr_chain(); foreach_jcr(jcr) { - if (jcr->JobId == 0) { /* this is us */ - free_locked_jcr(jcr); - continue; - } - free_locked_jcr(jcr); - njobs++; + if (jcr->JobId == 0) { /* this is us */ + continue; + } + tjobs++; /* count of all jobs */ + if (!acl_access_ok(ua, Job_ACL, jcr->job->name())) { + continue; /* skip not authorized */ + } + njobs++; /* count of authorized jobs */ } - unlock_jcr_chain(); - - if (njobs == 0) { - bsendmsg(ua, _("No Jobs running.\n")); - return 1; + endeach_jcr(jcr); + + 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")); - lock_jcr_chain(); foreach_jcr(jcr) { - if (jcr->JobId == 0) { /* this is us */ - free_locked_jcr(jcr); - continue; - } - add_prompt(ua, jcr->Job); - free_locked_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); } - unlock_jcr_chain(); + endeach_jcr(jcr); - if (do_prompt(ua, _("Job"), _("Choose Job to cancel"), JobName, sizeof(JobName)) < 0) { - return 1; + if (do_prompt(ua, _("Job"), _("Choose Job to cancel"), buf, sizeof(buf)) < 0) { + return 1; } - if (njobs == 1) { - if (!get_yesno(ua, _("Confirm cancel (yes/no): ")) || ua->pint32_val == 0) { - return 1; - } + if (ua->api && njobs == 1) { + char nbuf[1000]; + bsnprintf(nbuf, sizeof(nbuf), _("Cancel: %s\n\n%s"), buf, + _("Confirm cancel?")); + if (!get_yesno(ua, nbuf) || ua->pint32_val == 0) { + return 1; + } + } else { + if (njobs == 1) { + if (!get_yesno(ua, _("Confirm cancel (yes/no): ")) || ua->pint32_val == 0) { + return 1; + } + } } - /* NOTE! This increments the ref_count */ + 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); - return 1; + ua->warning_msg(_("Job \"%s\" not found.\n"), JobName); + return 1; } } ret = cancel_job(ua, jcr); free_jcr(jcr); - return ret; } @@ -454,24 +527,28 @@ static int cancel_cmd(UAContext *ua, const char *cmd) * 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(); + * */ -static void set_pooldbr_from_poolres(POOL_DBR *pr, POOL *pool, e_pool_op op) +void set_pooldbr_from_poolres(POOL_DBR *pr, POOL *pool, e_pool_op op) { - strcpy(pr->PoolType, pool->pool_type); + bstrncpy(pr->PoolType, pool->pool_type, sizeof(pr->PoolType)); if (op == POOL_OP_CREATE) { pr->MaxVols = pool->max_volumes; pr->NumVols = 0; - } else { /* update pool */ + } else { /* update pool */ if (pr->MaxVols != pool->max_volumes) { - pr->MaxVols = pool->max_volumes; + pr->MaxVols = pool->max_volumes; } if (pr->MaxVols != 0 && pr->MaxVols < pr->NumVols) { - pr->MaxVols = pr->NumVols; + pr->MaxVols = pr->NumVols; } } + pr->LabelType = pool->LabelType; pr->UseOnce = pool->use_volume_once; pr->UseCatalog = pool->use_catalog; - pr->AcceptAnyVolume = pool->accept_any_volume; pr->Recycle = pool->Recycle; pr->VolRetention = pool->VolRetention; pr->VolUseDuration = pool->VolUseDuration; @@ -481,19 +558,75 @@ static void set_pooldbr_from_poolres(POOL_DBR *pr, POOL *pool, e_pool_op op) pr->AutoPrune = pool->AutoPrune; pr->Recycle = pool->Recycle; if (pool->label_format) { - strcpy(pr->LabelFormat, pool->label_format); + bstrncpy(pr->LabelFormat, pool->label_format, sizeof(pr->LabelFormat)); } else { - strcpy(pr->LabelFormat, "*"); /* none */ + bstrncpy(pr->LabelFormat, "*", sizeof(pr->LabelFormat)); /* none */ + } +} + +/* 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 * Also called from backup.c - * Returns: -1 on error - * 0 record already exists - * 1 record created + * Returns: -1 on error + * 0 record already exists + * 1 record created */ int create_pool(JCR *jcr, B_DB *db, POOL *pool, e_pool_op op) @@ -502,21 +635,21 @@ int create_pool(JCR *jcr, B_DB *db, POOL *pool, e_pool_op op) memset(&pr, 0, sizeof(POOL_DBR)); - strcpy(pr.Name, pool->hdr.name); + bstrncpy(pr.Name, pool->name(), sizeof(pr.Name)); if (db_get_pool_record(jcr, db, &pr)) { /* Pool Exists */ if (op == POOL_OP_UPDATE) { /* update request */ - set_pooldbr_from_poolres(&pr, pool, op); - db_update_pool_record(jcr, db, &pr); + set_pooldbr_from_poolres(&pr, pool, op); + db_update_pool_record(jcr, db, &pr); } - return 0; /* exists */ + return 0; /* exists */ } set_pooldbr_from_poolres(&pr, pool, op); if (!db_create_pool_record(jcr, db, &pr)) { - return -1; /* error */ + return -1; /* error */ } return 1; } @@ -527,11 +660,11 @@ int create_pool(JCR *jcr, B_DB *db, POOL *pool, e_pool_op op) * Create a Pool Record in the database. * It is always created from the Resource record. */ -static int create_cmd(UAContext *ua, const char *cmd) +static int create_cmd(UAContext *ua, const char *cmd) { POOL *pool; - if (!open_db(ua)) { + if (!open_client_db(ua)) { return 1; } @@ -542,646 +675,131 @@ static int create_cmd(UAContext *ua, const char *cmd) 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; +} + + +extern DIRRES *director; +extern char *configfile; + +/* + * Python control command + * python restart (restarts interpreter) + */ +static int python_cmd(UAContext *ua, const char *cmd) +{ +#ifdef HAVE_PYTHON + init_python_interpreter_args python_args; + + if (ua->argc >= 2 && strcasecmp(ua->argk[1], NT_("restart")) == 0) { + term_python_interpreter(); + + python_args.progname = director->name(); + python_args.scriptdir = director->scripts_directory; + python_args.modulename = "DirStartUp"; + python_args.configfile = configfile; + python_args.workingdir = director->working_directory; + python_args.job_getattr = job_getattr; + python_args.job_setattr = job_setattr; + + init_python_interpreter(&python_args); + + ua->send_msg(_("Python interpreter restarted.\n")); + } else { +#endif /* HAVE_PYTHON */ + ua->warning_msg(_("Nothing done.\n")); +#ifdef HAVE_PYTHON + } +#endif /* HAVE_PYTHON */ return 1; } /* * Set a new address in a Client resource. We do this only - * if the Console name is the same as the Client name + * if the Console name is the same as the Client name * and the Console can access the client. */ -static int setip_cmd(UAContext *ua, const char *cmd) +static int setip_cmd(UAContext *ua, const char *cmd) { 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")); + char buf[1024]; + 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 = GetClientResWithName(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) { free(client->address); } /* MA Bug 6 remove ifdef */ - sockaddr_to_ascii(&(ua->UA_sock->client_addr), buf, sizeof(buf)); + 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; } -/* - * Update a Pool Record in the database. - * It is always updated from the Resource record. - * - * update pool= - * updates pool from Pool resource - * update media pool= volume= - * changes pool info for volume - * update slots [scan=...] - * updates autochanger slots - */ -static int update_cmd(UAContext *ua, const char *cmd) +static void do_en_disable_cmd(UAContext *ua, bool setting) { - static const char *kw[] = { - N_("media"), /* 0 */ - N_("volume"), /* 1 */ - N_("pool"), /* 2 */ - N_("slots"), /* 3 */ - NULL}; - - if (!open_db(ua)) { - return 1; - } - - switch (find_arg_keyword(ua, kw)) { - case 0: - case 1: - update_volume(ua); - return 1; - case 2: - update_pool(ua); - return 1; - case 3: - update_slots(ua); - return 1; - default: - break; - } - - start_prompt(ua, _("Update choice:\n")); - add_prompt(ua, _("Volume parameters")); - add_prompt(ua, _("Pool from resource")); - add_prompt(ua, _("Slots from autochanger")); - switch (do_prompt(ua, _("item"), _("Choose catalog item to update"), NULL, 0)) { - case 0: - update_volume(ua); - break; - case 1: - update_pool(ua); - break; - case 2: - update_slots(ua); - break; - default: - break; - } - return 1; -} - -static void update_volstatus(UAContext *ua, const char *val, MEDIA_DBR *mr) -{ - POOLMEM *query = get_pool_memory(PM_MESSAGE); - const char *kw[] = { - "Append", - "Archive", - "Disabled", - "Full", - "Used", - "Cleaning", - "Recycle", - "Read-Only", - NULL}; - bool found = false; + JOB *job; int i; - for (i=0; kw[i]; i++) { - if (strcasecmp(val, kw[i]) == 0) { - found = true; - break; - } - } - if (!found) { - bsendmsg(ua, _("Invalid VolStatus specified: %s\n"), val); - } else { - bstrncpy(mr->VolStatus, kw[i], sizeof(mr->VolStatus)); - Mmsg(query, "UPDATE Media SET VolStatus='%s' WHERE MediaId=%u", - mr->VolStatus, mr->MediaId); - if (!db_sql_query(ua->db, query, NULL, NULL)) { - bsendmsg(ua, "%s", db_strerror(ua->db)); - } else { - bsendmsg(ua, _("New Volume status is: %s\n"), mr->VolStatus); + i = find_arg_with_value(ua, NT_("job")); + if (i < 0) { + job = select_job_resource(ua); + if (!job) { + return; } - } - free_pool_memory(query); -} - -static void update_volretention(UAContext *ua, char *val, MEDIA_DBR *mr) -{ - char ed1[150]; - POOLMEM *query; - if (!duration_to_utime(val, &mr->VolRetention)) { - bsendmsg(ua, _("Invalid retention period specified: %s\n"), val); - return; - } - query = get_pool_memory(PM_MESSAGE); - Mmsg(query, "UPDATE Media SET VolRetention=%s WHERE MediaId=%u", - edit_uint64(mr->VolRetention, ed1), mr->MediaId); - if (!db_sql_query(ua->db, query, NULL, NULL)) { - bsendmsg(ua, "%s", db_strerror(ua->db)); - } else { - bsendmsg(ua, _("New retention period is: %s\n"), - edit_utime(mr->VolRetention, ed1, sizeof(ed1))); - } - free_pool_memory(query); -} - -static void update_voluseduration(UAContext *ua, char *val, MEDIA_DBR *mr) -{ - char ed1[150]; - POOLMEM *query; - - if (!duration_to_utime(val, &mr->VolUseDuration)) { - bsendmsg(ua, _("Invalid use duration specified: %s\n"), val); - return; - } - query = get_pool_memory(PM_MESSAGE); - Mmsg(query, "UPDATE Media SET VolUseDuration=%s WHERE MediaId=%u", - edit_uint64(mr->VolUseDuration, ed1), mr->MediaId); - if (!db_sql_query(ua->db, query, NULL, NULL)) { - bsendmsg(ua, "%s", db_strerror(ua->db)); - } else { - bsendmsg(ua, _("New use duration is: %s\n"), - edit_utime(mr->VolUseDuration, ed1, sizeof(ed1))); - } - free_pool_memory(query); -} - -static void update_volmaxjobs(UAContext *ua, char *val, MEDIA_DBR *mr) -{ - POOLMEM *query = get_pool_memory(PM_MESSAGE); - Mmsg(query, "UPDATE Media SET MaxVolJobs=%s WHERE MediaId=%u", - val, mr->MediaId); - if (!db_sql_query(ua->db, query, NULL, NULL)) { - bsendmsg(ua, "%s", db_strerror(ua->db)); } else { - bsendmsg(ua, _("New max jobs is: %s\n"), val); - } - free_pool_memory(query); -} - -static void update_volmaxfiles(UAContext *ua, char *val, MEDIA_DBR *mr) -{ - POOLMEM *query = get_pool_memory(PM_MESSAGE); - Mmsg(query, "UPDATE Media SET MaxVolFiles=%s WHERE MediaId=%u", - val, mr->MediaId); - if (!db_sql_query(ua->db, query, NULL, NULL)) { - bsendmsg(ua, "%s", db_strerror(ua->db)); - } else { - bsendmsg(ua, _("New max files is: %s\n"), val); - } - free_pool_memory(query); -} - -static void update_volmaxbytes(UAContext *ua, char *val, MEDIA_DBR *mr) -{ - uint64_t maxbytes; - char ed1[50]; - POOLMEM *query; - - if (!size_to_uint64(val, strlen(val), &maxbytes)) { - bsendmsg(ua, _("Invalid max. bytes specification: %s\n"), val); - return; + LockRes(); + job = GetJobResWithName(ua->argv[i]); + UnlockRes(); } - query = get_pool_memory(PM_MESSAGE); - Mmsg(query, "UPDATE Media SET MaxVolBytes=%s WHERE MediaId=%u", - edit_uint64(maxbytes, ed1), mr->MediaId); - if (!db_sql_query(ua->db, query, NULL, NULL)) { - bsendmsg(ua, "%s", db_strerror(ua->db)); - } else { - bsendmsg(ua, _("New Max bytes is: %s\n"), edit_uint64(maxbytes, ed1)); - } - free_pool_memory(query); -} - -static void update_volrecycle(UAContext *ua, char *val, MEDIA_DBR *mr) -{ - int recycle; - POOLMEM *query; - if (strcasecmp(val, _("yes")) == 0) { - recycle = 1; - } else if (strcasecmp(val, _("no")) == 0) { - recycle = 0; - } else { - bsendmsg(ua, _("Invalid value. It must by yes or no.\n")); + if (!job) { + ua->error_msg(_("Job \"%s\" not found.\n"), ua->argv[i]); return; } - query = get_pool_memory(PM_MESSAGE); - Mmsg(query, "UPDATE Media SET Recycle=%d WHERE MediaId=%u", - recycle, mr->MediaId); - if (!db_sql_query(ua->db, query, NULL, NULL)) { - bsendmsg(ua, "%s", db_strerror(ua->db)); - } else { - bsendmsg(ua, _("New Recycle flag is: %s\n"), - mr->Recycle==1?_("yes"):_("no")); - } - free_pool_memory(query); -} -/* Modify the Pool in which this Volume is located */ -static void update_vol_pool(UAContext *ua, char *val, MEDIA_DBR *mr, POOL_DBR *opr) -{ - POOL_DBR pr; - POOLMEM *query; - - memset(&pr, 0, sizeof(pr)); - bstrncpy(pr.Name, val, sizeof(pr.Name)); - if (!get_pool_dbr(ua, &pr)) { + if (!acl_access_ok(ua, Job_ACL, job->name())) { + ua->error_msg(_("Unauthorized command from this console.\n")); return; } - mr->PoolId = pr.PoolId; /* set new PoolId */ - /* - */ - query = get_pool_memory(PM_MESSAGE); - db_lock(ua->db); - Mmsg(query, "UPDATE Media SET PoolId=%d WHERE MediaId=%u", - mr->PoolId, mr->MediaId); - if (!db_sql_query(ua->db, query, NULL, NULL)) { - bsendmsg(ua, "%s", db_strerror(ua->db)); - } else { - bsendmsg(ua, _("New Pool is: %s\n"), pr.Name); - opr->NumVols--; - if (!db_update_pool_record(ua->jcr, ua->db, opr)) { - bsendmsg(ua, "%s", db_strerror(ua->db)); - } - pr.NumVols++; - if (!db_update_pool_record(ua->jcr, ua->db, &pr)) { - bsendmsg(ua, "%s", db_strerror(ua->db)); - } - db_make_inchanger_unique(ua->jcr, ua->db, mr); - } - db_unlock(ua->db); - free_pool_memory(query); + job->enabled = setting; + ua->send_msg(_("Job \"%s\" %sabled\n"), job->name(), setting?"en":"dis"); + return; } -/* - * Refresh the Volume information from the Pool record - */ -static void update_volfrompool(UAContext *ua, MEDIA_DBR *mr) +static int enable_cmd(UAContext *ua, const char *cmd) { - POOL_DBR pr; - - memset(&pr, 0, sizeof(pr)); - pr.PoolId = mr->PoolId; - if (!get_pool_dbr(ua, &pr)) { - return; - } - set_pool_dbr_defaults_in_media_dbr(mr, &pr); - if (!db_update_media_defaults(ua->jcr, ua->db, mr)) { - bsendmsg(ua, _("Error updating Volume record: ERR=%s"), db_strerror(ua->db)); - } else { - bsendmsg(ua, _("Volume defaults updated from Pool record.\n")); - } -} - -/* - * Refresh the Volume information from the Pool record - * for all Volumes - */ -static void update_all_vols_from_pool(UAContext *ua) -{ - POOL_DBR pr; - MEDIA_DBR mr; - - memset(&pr, 0, sizeof(pr)); - if (!get_pool_dbr(ua, &pr)) { - return; - } - memset(&mr, 0, sizeof(mr)); - set_pool_dbr_defaults_in_media_dbr(&mr, &pr); - mr.PoolId = pr.PoolId; - if (!db_update_media_defaults(ua->jcr, ua->db, &mr)) { - bsendmsg(ua, _("Error updating Volume records: ERR=%s"), db_strerror(ua->db)); - } else { - bsendmsg(ua, _("All Volume defaults updated from Pool record.\n")); - } -} - - -/* - * Update a media record -- allows you to change the - * Volume status. E.g. if you want Bacula to stop - * writing on the volume, set it to anything other - * than Append. - */ -static int update_volume(UAContext *ua) -{ - MEDIA_DBR mr; - POOL_DBR pr; - POOLMEM *query; - char ed1[130]; - bool done = false; - const char *kw[] = { - N_("VolStatus"), /* 0 */ - N_("VolRetention"), /* 1 */ - N_("VolUse"), /* 2 */ - N_("MaxVolJobs"), /* 3 */ - N_("MaxVolFiles"), /* 4 */ - N_("MaxVolBytes"), /* 5 */ - N_("Recycle"), /* 6 */ - N_("Pool"), /* 7 */ - N_("FromPool"), /* 8 */ - N_("AllFromPool"), /* 9 */ - NULL }; - - for (int i=0; kw[i]; i++) { - int j; - POOL_DBR pr; - if ((j=find_arg_with_value(ua, kw[i])) > 0) { - if (i != 9 && !select_media_dbr(ua, &mr)) { - return 0; - } - switch (i) { - case 0: - update_volstatus(ua, ua->argv[j], &mr); - break; - case 1: - update_volretention(ua, ua->argv[j], &mr); - break; - case 2: - update_voluseduration(ua, ua->argv[j], &mr); - break; - case 3: - update_volmaxjobs(ua, ua->argv[j], &mr); - break; - case 4: - update_volmaxfiles(ua, ua->argv[j], &mr); - break; - case 5: - update_volmaxbytes(ua, ua->argv[j], &mr); - break; - case 6: - update_volrecycle(ua, ua->argv[j], &mr); - break; - case 7: - memset(&pr, 0, sizeof(POOL_DBR)); - pr.PoolId = mr.PoolId; - if (!db_get_pool_record(ua->jcr, ua->db, &pr)) { - bsendmsg(ua, "%s", db_strerror(ua->db)); - break; - } - update_vol_pool(ua, ua->argv[j], &mr, &pr); - break; - case 8: - update_volfrompool(ua, &mr); - break; - case 9: - update_all_vols_from_pool(ua); - } - done = true; - } - } - - for ( ; !done; ) { - if (!select_media_dbr(ua, &mr)) { - return 0; - } - bsendmsg(ua, _("Updating Volume \"%s\"\n"), mr.VolumeName); - start_prompt(ua, _("Parameters to modify:\n")); - add_prompt(ua, _("Volume Status")); - add_prompt(ua, _("Volume Retention Period")); - add_prompt(ua, _("Volume Use Duration")); - add_prompt(ua, _("Maximum Volume Jobs")); - add_prompt(ua, _("Maximum Volume Files")); - add_prompt(ua, _("Maximum Volume Bytes")); - add_prompt(ua, _("Recycle Flag")); - add_prompt(ua, _("Slot")); - add_prompt(ua, _("InChanger Flag")); - add_prompt(ua, _("Volume Files")); - add_prompt(ua, _("Pool")); - add_prompt(ua, _("Volume from Pool")); - add_prompt(ua, _("All Volumes from Pool")); - add_prompt(ua, _("Done")); - switch (do_prompt(ua, "", _("Select parameter to modify"), NULL, 0)) { - case 0: /* Volume Status */ - /* Modify Volume Status */ - bsendmsg(ua, _("Current Volume status is: %s\n"), mr.VolStatus); - start_prompt(ua, _("Possible Values are:\n")); - add_prompt(ua, "Append"); /* Better not translate these as */ - add_prompt(ua, "Archive"); /* They are known in the database code */ - add_prompt(ua, "Disabled"); - add_prompt(ua, "Full"); - add_prompt(ua, "Used"); - add_prompt(ua, "Cleaning"); - if (strcmp(mr.VolStatus, "Purged") == 0) { - add_prompt(ua, "Recycle"); - } - add_prompt(ua, "Read-Only"); - if (do_prompt(ua, "", _("Choose new Volume Status"), ua->cmd, sizeof(mr.VolStatus)) < 0) { - return 1; - } - update_volstatus(ua, ua->cmd, &mr); - break; - case 1: /* Retention */ - bsendmsg(ua, _("Current retention period is: %s\n"), - edit_utime(mr.VolRetention, ed1, sizeof(ed1))); - if (!get_cmd(ua, _("Enter Volume Retention period: "))) { - return 0; - } - update_volretention(ua, ua->cmd, &mr); - break; - - case 2: /* Use Duration */ - bsendmsg(ua, _("Current use duration is: %s\n"), - edit_utime(mr.VolUseDuration, ed1, sizeof(ed1))); - if (!get_cmd(ua, _("Enter Volume Use Duration: "))) { - return 0; - } - update_voluseduration(ua, ua->cmd, &mr); - break; - - case 3: /* Max Jobs */ - bsendmsg(ua, _("Current max jobs is: %u\n"), mr.MaxVolJobs); - if (!get_pint(ua, _("Enter new Maximum Jobs: "))) { - return 0; - } - update_volmaxjobs(ua, ua->cmd, &mr); - break; - - case 4: /* Max Files */ - bsendmsg(ua, _("Current max files is: %u\n"), mr.MaxVolFiles); - if (!get_pint(ua, _("Enter new Maximum Files: "))) { - return 0; - } - update_volmaxfiles(ua, ua->cmd, &mr); - break; - - case 5: /* Max Bytes */ - bsendmsg(ua, _("Current value is: %s\n"), edit_uint64(mr.MaxVolBytes, ed1)); - if (!get_cmd(ua, _("Enter new Maximum Bytes: "))) { - return 0; - } - update_volmaxbytes(ua, ua->cmd, &mr); - break; - - - case 6: /* Recycle */ - bsendmsg(ua, _("Current recycle flag is: %s\n"), - mr.Recycle==1?_("yes"):_("no")); - if (!get_yesno(ua, _("Enter new Recycle status: "))) { - return 0; - } - update_volrecycle(ua, ua->cmd, &mr); - break; - - case 7: /* Slot */ - int Slot; - - memset(&pr, 0, sizeof(POOL_DBR)); - pr.PoolId = mr.PoolId; - if (!db_get_pool_record(ua->jcr, ua->db, &pr)) { - bsendmsg(ua, "%s", db_strerror(ua->db)); - return 0; - } - bsendmsg(ua, _("Current Slot is: %d\n"), mr.Slot); - if (!get_pint(ua, _("Enter new Slot: "))) { - return 0; - } - Slot = ua->pint32_val; - if (pr.MaxVols > 0 && Slot > (int)pr.MaxVols) { - bsendmsg(ua, _("Invalid slot, it must be between 0 and %d\n"), - pr.MaxVols); - break; - } - mr.Slot = Slot; - /* - * Make sure to use db_update... rather than doing this directly, - * so that any Slot is handled correctly. - */ - if (!db_update_media_record(ua->jcr, ua->db, &mr)) { - bsendmsg(ua, _("Error updating media record Slot: ERR=%s"), db_strerror(ua->db)); - } else { - bsendmsg(ua, _("New Slot is: %d\n"), mr.Slot); - } - break; - - case 8: /* InChanger */ - bsendmsg(ua, _("Current InChanger flag is: %d\n"), mr.InChanger); - if (!get_yesno(ua, _("Set InChanger flag? yes/no: "))) { - return 0; - } - mr.InChanger = ua->pint32_val; - /* - * Make sure to use db_update... rather than doing this directly, - * so that any Slot is handled correctly. - */ - if (!db_update_media_record(ua->jcr, ua->db, &mr)) { - bsendmsg(ua, _("Error updating media record Slot: ERR=%s"), db_strerror(ua->db)); - } else { - bsendmsg(ua, _("New InChanger flag is: %d\n"), mr.InChanger); - } - break; - - - case 9: /* Volume Files */ - int32_t VolFiles; - bsendmsg(ua, _("Warning changing Volume Files can result\n" - "in loss of data on your Volume\n\n")); - bsendmsg(ua, _("Current Volume Files is: %u\n"), mr.VolFiles); - if (!get_pint(ua, _("Enter new number of Files for Volume: "))) { - return 0; - } - VolFiles = ua->pint32_val; - if (VolFiles != (int)(mr.VolFiles + 1)) { - bsendmsg(ua, _("Normally, you should only increase Volume Files by one!\n")); - if (!get_yesno(ua, _("Continue? (yes/no): ")) || ua->pint32_val == 0) { - break; - } - } - query = get_pool_memory(PM_MESSAGE); - Mmsg(query, "UPDATE Media SET VolFiles=%u WHERE MediaId=%u", - VolFiles, mr.MediaId); - if (!db_sql_query(ua->db, query, NULL, NULL)) { - bsendmsg(ua, "%s", db_strerror(ua->db)); - } else { - bsendmsg(ua, _("New Volume Files is: %u\n"), VolFiles); - } - free_pool_memory(query); - break; - - case 10: /* Volume's Pool */ - memset(&pr, 0, sizeof(POOL_DBR)); - pr.PoolId = mr.PoolId; - if (!db_get_pool_record(ua->jcr, ua->db, &pr)) { - bsendmsg(ua, "%s", db_strerror(ua->db)); - return 0; - } - bsendmsg(ua, _("Current Pool is: %s\n"), pr.Name); - if (!get_cmd(ua, _("Enter new Pool name: "))) { - return 0; - } - update_vol_pool(ua, ua->cmd, &mr, &pr); - return 1; - - case 11: - update_volfrompool(ua, &mr); - break; - case 12: - update_all_vols_from_pool(ua); - break; - default: /* Done or error */ - bsendmsg(ua, "Selection done.\n"); - return 1; - } - } + do_en_disable_cmd(ua, true); return 1; } -/* - * Update pool record -- pull info from current POOL resource - */ -static int update_pool(UAContext *ua) +static int disable_cmd(UAContext *ua, const char *cmd) { - POOL_DBR pr; - int id; - POOL *pool; - POOLMEM *query; - - pool = get_pool_resource(ua); - if (!pool) { - return 0; - } - - memset(&pr, 0, sizeof(pr)); - strcpy(pr.Name, pool->hdr.name); - if (!get_pool_dbr(ua, &pr)) { - return 0; - } - - set_pooldbr_from_poolres(&pr, pool, POOL_OP_UPDATE); /* update */ - - id = db_update_pool_record(ua->jcr, ua->db, &pr); - if (id <= 0) { - bsendmsg(ua, _("db_update_pool_record returned %d. ERR=%s\n"), - id, db_strerror(ua->db)); - } - query = get_pool_memory(PM_MESSAGE); - Mmsg(query, list_pool, pr.PoolId); - db_list_sql_query(ua->jcr, ua->db, query, prtit, ua, 1, HORZ_LIST); - free_pool_memory(query); - bsendmsg(ua, _("Pool DB record updated from resource.\n")); + do_en_disable_cmd(ua, false); return 1; } @@ -1189,27 +807,31 @@ static int update_pool(UAContext *ua) static void do_storage_setdebug(UAContext *ua, STORE *store, int level, int trace_flag) { BSOCK *sd; - - ua->jcr->store = store; + JCR *jcr = ua->jcr; + 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"), - store->hdr.name, store->address, store->SDport); - if (!connect_to_storage_daemon(ua->jcr, 1, 15, 0)) { - bsendmsg(ua, _("Failed to connect to Storage daemon.\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)) { + ua->error_msg(_("Failed to connect to Storage daemon.\n")); return; } Dmsg0(120, _("Connected to storage daemon\n")); - sd = ua->jcr->store_bsock; - bnet_fsend(sd, "setdebug=%d trace=%d\n", level, trace_flag); - if (bnet_recv(sd) >= 0) { - bsendmsg(ua, "%s", sd->msg); - } - bnet_sig(sd, BNET_TERMINATE); - bnet_close(sd); - ua->jcr->store_bsock = NULL; - return; + sd = jcr->store_bsock; + sd->fsend("setdebug=%d trace=%d\n", level, trace_flag); + if (sd->recv() >= 0) { + ua->send_msg("%s", sd->msg); + } + sd->signal(BNET_TERMINATE); + sd->close(); + jcr->store_bsock = NULL; + return; } - + static void do_client_setdebug(UAContext *ua, CLIENT *client, int level, int trace_flag) { BSOCK *fd; @@ -1218,22 +840,22 @@ static void do_client_setdebug(UAContext *ua, CLIENT *client, int level, int tra 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); + fd->fsend("setdebug=%d trace=%d\n", level, trace_flag); + if (fd->recv() >= 0) { + ua->send_msg("%s", fd->msg); } - bnet_sig(fd, BNET_TERMINATE); - bnet_close(fd); + fd->signal(BNET_TERMINATE); + fd->close(); ua->jcr->file_bsock = NULL; - return; + return; } @@ -1249,24 +871,26 @@ static void do_all_setdebug(UAContext *ua, int level, int trace_flag) /* Count Storage items */ LockRes(); store = NULL; - for (i=0; (store = (STORE *)GetNextRes(R_STORAGE, (RES *)store)); i++) - { } + i = 0; + foreach_res(store, R_STORAGE) { + i++; + } unique_store = (STORE **) malloc(i * sizeof(STORE)); - /* Find Unique Storage address/port */ + /* Find Unique Storage address/port */ store = (STORE *)GetNextRes(R_STORAGE, NULL); i = 0; unique_store[i++] = store; while ((store = (STORE *)GetNextRes(R_STORAGE, (RES *)store))) { found = 0; for (j=0; jaddress, store->address) == 0 && - unique_store[j]->SDport == store->SDport) { - found = 1; - break; - } + if (strcmp(unique_store[j]->address, store->address) == 0 && + unique_store[j]->SDport == store->SDport) { + found = 1; + break; + } } if (!found) { - unique_store[i++] = store; + unique_store[i++] = store; Dmsg2(140, "Stuffing: %s:%d\n", store->address, store->SDport); } } @@ -1281,24 +905,26 @@ static void do_all_setdebug(UAContext *ua, int level, int trace_flag) /* Count Client items */ LockRes(); client = NULL; - for (i=0; (client = (CLIENT *)GetNextRes(R_CLIENT, (RES *)client)); i++) - { } + i = 0; + foreach_res(client, R_CLIENT) { + i++; + } unique_client = (CLIENT **) malloc(i * sizeof(CLIENT)); - /* Find Unique Client address/port */ + /* Find Unique Client address/port */ client = (CLIENT *)GetNextRes(R_CLIENT, NULL); i = 0; unique_client[i++] = client; while ((client = (CLIENT *)GetNextRes(R_CLIENT, (RES *)client))) { found = 0; for (j=0; jaddress, client->address) == 0 && - unique_client[j]->FDport == client->FDport) { - found = 1; - break; - } + if (strcmp(unique_client[j]->address, client->address) == 0 && + unique_client[j]->FDport == client->FDport) { + found = 1; + break; + } } if (!found) { - unique_client[i++] = client; + unique_client[i++] = client; Dmsg2(140, "Stuffing: %s:%d\n", client->address, client->FDport); } } @@ -1322,79 +948,76 @@ static int setdebug_cmd(UAContext *ua, const char *cmd) int trace_flag = -1; int i; - if (!open_db(ua)) { - return 1; - } Dmsg1(120, "setdebug:%s:\n", cmd); level = -1; - i = find_arg_with_value(ua, _("level")); + i = find_arg_with_value(ua, "level"); if (i >= 0) { level = atoi(ua->argv[i]); } if (level < 0) { if (!get_pint(ua, _("Enter new debug level: "))) { - return 1; + return 1; } level = ua->pint32_val; } /* Look for trace flag. -1 => not change */ - i = find_arg_with_value(ua, _("trace")); + i = find_arg_with_value(ua, "trace"); if (i >= 0) { trace_flag = atoi(ua->argv[i]); if (trace_flag > 0) { - trace_flag = 1; + trace_flag = 1; } } /* General debug? */ for (i=1; iargc; i++) { - if (strcasecmp(ua->argk[i], _("all")) == 0) { - do_all_setdebug(ua, level, trace_flag); - return 1; - } - if (strcasecmp(ua->argk[i], _("dir")) == 0 || - strcasecmp(ua->argk[i], _("director")) == 0) { - debug_level = level; - set_trace(trace_flag); - return 1; - } - if (strcasecmp(ua->argk[i], _("client")) == 0 || - strcasecmp(ua->argk[i], _("fd")) == 0) { - client = NULL; - if (ua->argv[i]) { - client = (CLIENT *)GetResWithName(R_CLIENT, ua->argv[i]); - if (client) { - do_client_setdebug(ua, client, level, trace_flag); - return 1; - } - } - client = select_client_resource(ua); - if (client) { - do_client_setdebug(ua, client, level, trace_flag); - return 1; - } - } - - if (strcasecmp(ua->argk[i], _("store")) == 0 || - strcasecmp(ua->argk[i], _("storage")) == 0 || - strcasecmp(ua->argk[i], _("sd")) == 0) { - store = NULL; - if (ua->argv[i]) { - store = (STORE *)GetResWithName(R_STORAGE, ua->argv[i]); - if (store) { - do_storage_setdebug(ua, store, level, trace_flag); - return 1; - } - } - store = get_storage_resource(ua, 0); - if (store) { - do_storage_setdebug(ua, store, level, trace_flag); - return 1; - } + if (strcasecmp(ua->argk[i], "all") == 0) { + do_all_setdebug(ua, level, trace_flag); + return 1; } - } + if (strcasecmp(ua->argk[i], "dir") == 0 || + strcasecmp(ua->argk[i], "director") == 0) { + debug_level = level; + set_trace(trace_flag); + return 1; + } + if (strcasecmp(ua->argk[i], "client") == 0 || + strcasecmp(ua->argk[i], "fd") == 0) { + client = NULL; + if (ua->argv[i]) { + client = GetClientResWithName(ua->argv[i]); + if (client) { + do_client_setdebug(ua, client, level, trace_flag); + return 1; + } + } + client = select_client_resource(ua); + if (client) { + do_client_setdebug(ua, client, level, trace_flag); + return 1; + } + } + + if (strcasecmp(ua->argk[i], NT_("store")) == 0 || + strcasecmp(ua->argk[i], NT_("storage")) == 0 || + strcasecmp(ua->argk[i], NT_("sd")) == 0) { + store = NULL; + if (ua->argv[i]) { + store = GetStoreResWithName(ua->argv[i]); + if (store) { + do_storage_setdebug(ua, store, level, trace_flag); + return 1; + } + } + store = get_storage_resource(ua, false/*no default*/); + if (store) { + do_storage_setdebug(ua, store, level, trace_flag); + return 1; + } + } + } /* * We didn't find an appropriate keyword above, so * prompt the user. @@ -1405,20 +1028,20 @@ static int setdebug_cmd(UAContext *ua, const char *cmd) add_prompt(ua, _("Client")); add_prompt(ua, _("All")); switch(do_prompt(ua, "", _("Select daemon type to set debug level"), NULL, 0)) { - case 0: /* Director */ + case 0: /* Director */ debug_level = level; set_trace(trace_flag); break; case 1: - store = get_storage_resource(ua, 0); + store = get_storage_resource(ua, false/*no default*/); if (store) { - do_storage_setdebug(ua, store, level, trace_flag); + do_storage_setdebug(ua, store, level, trace_flag); } break; case 2: client = select_client_resource(ua); if (client) { - do_client_setdebug(ua, client, level, trace_flag); + do_client_setdebug(ua, client, level, trace_flag); } break; case 3: @@ -1439,15 +1062,15 @@ static int trace_cmd(UAContext *ua, const char *cmd) if (ua->argc != 2) { if (!get_cmd(ua, _("Turn on or off? "))) { - return 1; + return 1; } onoff = ua->cmd; } else { onoff = ua->argk[1]; } - set_trace((strcasecmp(onoff, _("off")) == 0) ? false : true); - return 1; + set_trace((strcasecmp(onoff, NT_("off")) == 0) ? false : true); + return 1; } @@ -1456,7 +1079,7 @@ static int var_cmd(UAContext *ua, const char *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 */ @@ -1466,8 +1089,8 @@ static int var_cmd(UAContext *ua, const char *cmd) var++; } Dmsg1(100, "Var=%s:\n", var); - variable_expansion(ua->jcr, var, &val); - bsendmsg(ua, "%s\n", val); + variable_expansion(ua->jcr, var, &val); + ua->send_msg("%s\n", val); free_pool_memory(val); return 1; } @@ -1477,53 +1100,91 @@ static int estimate_cmd(UAContext *ua, const char *cmd) JOB *job = NULL; CLIENT *client = NULL; FILESET *fileset = NULL; - FILESET_DBR fsr; int listing = 0; char since[MAXSTRING]; JCR *jcr = ua->jcr; - jcr->JobLevel = L_FULL; + jcr->set_JobLevel(L_FULL); for (int i=1; iargc; i++) { - if (strcasecmp(ua->argk[i], _("client")) == 0 || - strcasecmp(ua->argk[i], _("fd")) == 0) { - if (ua->argv[i]) { - client = (CLIENT *)GetResWithName(R_CLIENT, ua->argv[i]); - continue; - } - } - if (strcasecmp(ua->argk[i], _("job")) == 0) { - if (ua->argv[i]) { - job = (JOB *)GetResWithName(R_JOB, ua->argv[i]); - continue; - } - } - if (strcasecmp(ua->argk[i], _("fileset")) == 0) { - if (ua->argv[i]) { - fileset = (FILESET *)GetResWithName(R_FILESET, ua->argv[i]); - continue; - } - } - if (strcasecmp(ua->argk[i], _("listing")) == 0) { - listing = 1; - continue; - } - if (strcasecmp(ua->argk[i], _("level")) == 0) { - if (!get_level_from_name(ua->jcr, ua->argv[i])) { - bsendmsg(ua, _("Level %s not valid.\n"), ua->argv[i]); - } - continue; + if (strcasecmp(ua->argk[i], NT_("client")) == 0 || + strcasecmp(ua->argk[i], NT_("fd")) == 0) { + if (ua->argv[i]) { + client = GetClientResWithName(ua->argv[i]); + if (!client) { + ua->error_msg(_("Client \"%s\" not found.\n"), ua->argv[i]); + return 1; + } + continue; + } else { + ua->error_msg(_("Client name missing.\n")); + return 1; + } } - } + if (strcasecmp(ua->argk[i], NT_("job")) == 0) { + if (ua->argv[i]) { + job = GetJobResWithName(ua->argv[i]); + if (!job) { + ua->error_msg(_("Job \"%s\" not found.\n"), ua->argv[i]); + return 1; + } + if (!acl_access_ok(ua, Job_ACL, job->name())) { + ua->error_msg(_("No authorization for Job \"%s\"\n"), job->name()); + return 1; + } + continue; + } else { + ua->error_msg(_("Job name missing.\n")); + return 1; + } + + } + if (strcasecmp(ua->argk[i], NT_("fileset")) == 0) { + if (ua->argv[i]) { + fileset = GetFileSetResWithName(ua->argv[i]); + if (!fileset) { + ua->error_msg(_("Fileset \"%s\" not found.\n"), ua->argv[i]); + return 1; + } + if (!acl_access_ok(ua, FileSet_ACL, fileset->name())) { + ua->error_msg(_("No authorization for FileSet \"%s\"\n"), fileset->name()); + return 1; + } + continue; + } else { + ua->error_msg(_("Fileset name missing.\n")); + return 1; + } + } + if (strcasecmp(ua->argk[i], NT_("listing")) == 0) { + listing = 1; + continue; + } + if (strcasecmp(ua->argk[i], NT_("level")) == 0) { + if (ua->argv[i]) { + if (!get_level_from_name(ua->jcr, ua->argv[i])) { + ua->error_msg(_("Level \"%s\" not valid.\n"), ua->argv[i]); + } + continue; + } else { + ua->error_msg(_("Level value missing.\n")); + return 1; + } + } + } if (!job && !(client && fileset)) { if (!(job = select_job_resource(ua))) { - return 1; + return 1; } } if (!job) { - job = (JOB *)GetResWithName(R_JOB, ua->argk[1]); + job = GetJobResWithName(ua->argk[1]); if (!job) { - bsendmsg(ua, _("No job specified.\n")); - return 1; + 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; } } if (!client) { @@ -1535,39 +1196,43 @@ static int estimate_cmd(UAContext *ua, const char *cmd) jcr->client = client; jcr->fileset = fileset; close_db(ua); - ua->catalog = client->catalog; + if (job->pool->catalog) { + ua->catalog = job->pool->catalog; + } else { + ua->catalog = client->catalog; + } if (!open_db(ua)) { return 1; } jcr->job = job; - jcr->JobType = JT_BACKUP; + jcr->set_JobType(JT_BACKUP); init_jcr_job_record(jcr); if (!get_or_create_client_record(jcr)) { return 1; } - if (!get_or_create_fileset_record(jcr, &fsr)) { + if (!get_or_create_fileset_record(jcr)) { 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"), + jcr->client->name(), jcr->client->address, jcr->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; } @@ -1577,7 +1242,7 @@ static int estimate_cmd(UAContext *ua, const char *cmd) 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: @@ -1598,9 +1263,9 @@ static int time_cmd(UAContext *ua, const char *cmd) char sdt[50]; time_t ttime = time(NULL); struct tm tm; - localtime_r(&ttime, &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; } @@ -1611,7 +1276,7 @@ extern "C" void reload_config(int sig); static int reload_cmd(UAContext *ua, const char *cmd) { - reload_config(1); + reload_config(1); return 1; } @@ -1620,41 +1285,39 @@ static int reload_cmd(UAContext *ua, const char *cmd) * * delete pool= * delete volume pool= volume= - * delete job jobid=xxx + * delete jobid=xxx */ static int delete_cmd(UAContext *ua, const char *cmd) { static const char *keywords[] = { - N_("volume"), - N_("pool"), - N_("job"), - N_("jobid"), + NT_("volume"), + NT_("pool"), + NT_("jobid"), NULL}; - if (!open_db(ua)) { + if (!open_client_db(ua)) { return 1; } - switch (find_arg_keyword(ua, keywords)) { + switch (find_arg_keyword(ua, keywords)) { case 0: - delete_volume(ua); + delete_volume(ua); return 1; case 1: delete_pool(ua); return 1; case 2: - case 3: int i; - while ((i=find_arg(ua, _("jobid"))) > 0) { - delete_job(ua); - *ua->argk[i] = 0; /* zap keyword already visited */ + while ((i=find_arg(ua, "jobid")) > 0) { + delete_job(ua); + *ua->argk[i] = 0; /* zap keyword already visited */ } return 1; default: 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")); @@ -1669,7 +1332,7 @@ static int delete_cmd(UAContext *ua, const char *cmd) delete_job(ua); return 1; default: - bsendmsg(ua, _("Nothing done.\n")); + ua->warning_msg(_("Nothing done.\n")); break; } return 1; @@ -1679,8 +1342,8 @@ static int delete_cmd(UAContext *ua, const char *cmd) /* * delete_job has been modified to parse JobID lists like the * following: - * delete job JobID=3,4,6,7-11,14 - * + * delete JobID=3,4,6,7-11,14 + * * Thanks to Phil Stracchino for the above addition. */ @@ -1689,46 +1352,47 @@ static void delete_job(UAContext *ua) JobId_t JobId; char *s,*sep,*tok; - int i = find_arg_with_value(ua, _("jobid")); + int i = find_arg_with_value(ua, NT_("jobid")); if (i >= 0) { if (strchr(ua->argv[i], ',') != NULL || strchr(ua->argv[i], '-') != NULL) { - s = bstrdup(ua->argv[i]); - tok = s; - /* + s = bstrdup(ua->argv[i]); + tok = s; + /* * We could use strtok() here. But we're not going to, because: - * (a) strtok() is deprecated, having been replaced by strsep(); - * (b) strtok() is broken in significant ways. + * (a) strtok() is deprecated, having been replaced by strsep(); + * (b) strtok() is broken in significant ways. * we could use strsep() instead, but it's not universally available. - * so we grow our own using strchr(). - */ + * so we grow our own using strchr(). + */ sep = strchr(tok, ','); - while (sep != NULL) { + while (sep != NULL) { *sep = '\0'; if (strchr(tok, '-')) { - delete_job_id_range(ua, tok); - } else { - JobId = str_to_int64(tok); - } - tok = ++sep; + delete_job_id_range(ua, tok); + } else { + JobId = str_to_int64(tok); + do_job_delete(ua, JobId); + } + tok = ++sep; sep = strchr(tok, ','); - } - /* pick up the last token */ + } + /* pick up the last token */ if (strchr(tok, '-')) { - delete_job_id_range(ua, tok); - } else { - JobId = str_to_int64(tok); - do_job_delete(ua, JobId); - } - - free(s); + delete_job_id_range(ua, tok); + } else { + JobId = str_to_int64(tok); + do_job_delete(ua, JobId); + } + + free(s); } else { - JobId = str_to_int64(ua->argv[i]); - do_job_delete(ua, JobId); + JobId = str_to_int64(ua->argv[i]); + do_job_delete(ua, JobId); } } else if (!get_pint(ua, _("Enter JobId to delete: "))) { return; } else { - JobId = ua->pint32_val; + JobId = ua->int64_val; do_job_delete(ua, JobId); } } @@ -1753,39 +1417,39 @@ static void delete_job_id_range(UAContext *ua, char *tok) /* * do_job_delete now performs the actual delete operation atomically - * we always return 1 because C++ is pissy about void functions */ - static void do_job_delete(UAContext *ua, JobId_t JobId) { - POOLMEM *query = get_pool_memory(PM_MESSAGE); - - Mmsg(query, "DELETE FROM Job WHERE JobId=%u", JobId); - db_sql_query(ua->db, query, NULL, (void *)NULL); - Mmsg(query, "DELETE FROM File WHERE JobId=%u", JobId); - db_sql_query(ua->db, query, NULL, (void *)NULL); - Mmsg(query, "DELETE FROM JobMedia WHERE JobId=%u", JobId); - db_sql_query(ua->db, query, NULL, (void *)NULL); - free_pool_memory(query); - bsendmsg(ua, _("Job %u and associated records deleted from the catalog.\n"), JobId); + char ed1[50]; + + edit_int64(JobId, ed1); + purge_jobs_from_catalog(ua, ed1); + ua->send_msg(_("Job %s and associated records deleted from the catalog.\n"), ed1); } /* - * Delete media records from database -- dangerous + * Delete media records from database -- dangerous */ static int delete_volume(UAContext *ua) { MEDIA_DBR mr; + char buf[1000]; 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); - if (!get_yesno(ua, _("Are you sure you want to delete this Volume? (yes/no): "))) { - return 1; + if (find_arg(ua, "yes") >= 0) { + ua->pint32_val = 1; /* Have "yes" on command line already" */ + } else { + bsnprintf(buf, sizeof(buf), _("Are you sure you want to delete Volume \"%s\"? (yes/no): "), + mr.VolumeName); + if (!get_yesno(ua, buf)) { + return 1; + } } if (ua->pint32_val) { db_delete_media_record(ua->jcr, ua->db, &mr); @@ -1794,18 +1458,21 @@ static int delete_volume(UAContext *ua) } /* - * Delete a pool record from the database -- dangerous + * Delete a pool record from the database -- dangerous */ static int delete_pool(UAContext *ua) { POOL_DBR pr; - + char buf[200]; + memset(&pr, 0, sizeof(pr)); if (!get_pool_dbr(ua, &pr)) { return 1; } - if (!get_yesno(ua, _("Are you sure you want to delete this Pool? (yes/no): "))) { + bsnprintf(buf, sizeof(buf), _("Are you sure you want to delete Pool \"%s\"? (yes/no): "), + pr.Name); + if (!get_yesno(ua, buf)) { return 1; } if (ua->pint32_val) { @@ -1814,46 +1481,63 @@ static int delete_pool(UAContext *ua) return 1; } +int memory_cmd(UAContext *ua, const char *cmd) +{ + list_dir_status_header(ua); + sm_dump(false, true); + return 1; +} 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, 1); - if (!store) { + store.store = get_storage_resource(ua, true/*arg is storage*/); + if (!store.store) { return; } + pm_strcpy(store.store_source, _("unknown source")); + set_wstorage(jcr, &store); + drive = get_storage_drive(ua, store.store); + if (strcmp(command, "mount") == 0) { + slot = get_storage_slot(ua, store.store); + } - Dmsg2(120, "Found storage, MediaType=%s DevName=%s\n", - store->media_type, store->dev_name); + Dmsg3(120, "Found storage, MediaType=%s DevName=%s drive=%d\n", + store.store->media_type, store.store->dev_name(), drive); - ua->jcr->store = store; - if (!connect_to_storage_daemon(ua->jcr, 10, SDConnectTimeout, 1)) { - bsendmsg(ua, _("Failed to connect to Storage daemon.\n")); + if (!connect_to_storage_daemon(jcr, 10, SDConnectTimeout, 1)) { + ua->error_msg(_("Failed to connect to Storage daemon.\n")); return; } - sd = ua->jcr->store_bsock; - strcpy(dev_name, store->dev_name); + sd = jcr->store_bsock; + bstrncpy(dev_name, store.store->dev_name(), sizeof(dev_name)); bash_spaces(dev_name); - bnet_fsend(sd, "%s %s", command, dev_name); + if (slot > 0) { + bnet_fsend(sd, "%s %s drive=%d slot=%d", command, dev_name, drive, slot); + } else { + 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->jcr->store_bsock = NULL; + jcr->store_bsock = NULL; } /* - * mount [storage | device] + * mount [storage=] [drive=nn] [slot=mm] */ static int mount_cmd(UAContext *ua, const char *cmd) { @@ -1863,7 +1547,7 @@ static int mount_cmd(UAContext *ua, const char *cmd) /* - * unmount [storage | device] + * unmount [storage=] [drive=nn] */ static int unmount_cmd(UAContext *ua, const char *cmd) { @@ -1873,7 +1557,7 @@ static int unmount_cmd(UAContext *ua, const char *cmd) /* - * release [storage | device] + * release [storage=] [drive=nn] */ static int release_cmd(UAContext *ua, const char *cmd) { @@ -1891,7 +1575,7 @@ static int use_cmd(UAContext *ua, const char *cmd) CAT *oldcatalog, *catalog; - close_db(ua); /* close any previously open db */ + close_db(ua); /* close any previously open db */ oldcatalog = ua->catalog; if (!(catalog = get_catalog_resource(ua))) { @@ -1900,41 +1584,199 @@ static int use_cmd(UAContext *ua, const char *cmd) 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) +int quit_cmd(UAContext *ua, const char *cmd) { - ua->quit = TRUE; + ua->quit = true; return 1; } +/* Handler to get job status */ +static int status_handler(void *ctx, int num_fields, char **row) +{ + char *val = (char *)ctx; + + if (row[0]) { + *val = row[0][0]; + } else { + *val = '?'; /* Unknown by default */ + } + + return 0; +} + /* - * Wait until no job is running + * Wait until no job is running */ -int wait_cmd(UAContext *ua, const char *cmd) +int wait_cmd(UAContext *ua, const char *cmd) { JCR *jcr; - bmicrosleep(0, 200000); /* let job actually start */ + int i; + time_t stop_time = 0; + + /* + * no args + * Wait until no job is running + */ + if (ua->argc == 1) { + bmicrosleep(0, 200000); /* let job actually start */ + for (bool running=true; running; ) { + running = false; + foreach_jcr(jcr) { + if (jcr->JobId != 0) { + running = true; + break; + } + } + endeach_jcr(jcr); + + if (running) { + bmicrosleep(1, 0); + } + } + return 1; + } + + i = find_arg_with_value(ua, NT_("timeout")); + if (i > 0 && ua->argv[i]) { + stop_time = time(NULL) + str_to_int64(ua->argv[i]); + } + + /* we have jobid, jobname or ujobid argument */ + + uint32_t jobid = 0 ; + + if (!open_client_db(ua)) { + ua->error_msg(_("ERR: Can't open db\n")) ; + return 1; + } + + for (int i=1; iargc; i++) { + if (strcasecmp(ua->argk[i], "jobid") == 0) { + if (!ua->argv[i]) { + break; + } + jobid = str_to_int64(ua->argv[i]); + break; + } else if (strcasecmp(ua->argk[i], "jobname") == 0 || + strcasecmp(ua->argk[i], "job") == 0) { + if (!ua->argv[i]) { + break; + } + jcr=get_jcr_by_partial_name(ua->argv[i]) ; + if (jcr) { + jobid = jcr->JobId ; + free_jcr(jcr); + } + break; + } else if (strcasecmp(ua->argk[i], "ujobid") == 0) { + if (!ua->argv[i]) { + break; + } + jcr=get_jcr_by_full_name(ua->argv[i]) ; + if (jcr) { + jobid = jcr->JobId ; + free_jcr(jcr); + } + break; + /* Wait for a mount request */ + } else if (strcasecmp(ua->argk[i], "mount") == 0) { + for (bool waiting=false; !waiting; ) { + foreach_jcr(jcr) { + if (jcr->JobId != 0 && + (jcr->JobStatus == JS_WaitMedia || jcr->JobStatus == JS_WaitMount)) { + waiting = true; + break; + } + } + endeach_jcr(jcr); + if (waiting) { + break; + } + if (stop_time && (time(NULL) >= stop_time)) { + ua->warning_msg(_("Wait on mount timed out\n")); + return 1; + } + bmicrosleep(1, 0); + } + return 1; + } + } + + if (jobid == 0) { + ua->error_msg(_("ERR: Job was not found\n")); + return 1 ; + } + + /* + * We wait the end of a specific job + */ + + bmicrosleep(0, 200000); /* let job actually start */ for (bool running=true; running; ) { running = false; - lock_jcr_chain(); - foreach_jcr(jcr) { - if (jcr->JobId != 0) { - running = true; - free_locked_jcr(jcr); - break; - } - free_locked_jcr(jcr); - } - unlock_jcr_chain(); + + jcr=get_jcr_by_id(jobid) ; + + if (jcr) { + running = true ; + free_jcr(jcr); + } + if (running) { - bmicrosleep(1, 0); + bmicrosleep(1, 0); } } + + /* + * We have to get JobStatus + */ + + int status ; + char jobstatus = '?'; /* Unknown by default */ + char buf[256] ; + + bsnprintf(buf, sizeof(buf), + "SELECT JobStatus FROM Job WHERE JobId='%i'", jobid); + + + db_sql_query(ua->db, buf, + status_handler, (void *)&jobstatus); + + switch (jobstatus) { + case JS_Error: + status = 1 ; /* Warning */ + break; + + case JS_FatalError: + case JS_ErrorTerminated: + case JS_Canceled: + status = 2 ; /* Critical */ + break; + + case JS_Terminated: + status = 0 ; /* Ok */ + break; + + default: + status = 3 ; /* Unknown */ + break; + } + + ua->send_msg("JobId=%i\n", jobid) ; + ua->send_msg("JobStatus=%s (%c)\n", + job_status_to_str(jobstatus), + jobstatus) ; + + if (ua->gui || ua->api) { + ua->send_msg("ExitStatus=%i\n", status) ; + } + return 1; } @@ -1943,11 +1785,11 @@ static int help_cmd(UAContext *ua, const char *cmd) { unsigned int i; - bsendmsg(ua, _(" Command Description\n ======= ===========\n")); + ua->send_msg(_(" Command Description\n ======= ===========\n")); for (i=0; isend_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; } @@ -1956,58 +1798,157 @@ int qhelp_cmd(UAContext *ua, const char *cmd) unsigned int i; for (i=0; isend_msg("%s %s\n", commands[i].key, _(commands[i].help)); } return 1; } +#if 1 static int version_cmd(UAContext *ua, const char *cmd) { - bsendmsg(ua, "%s Version: " VERSION " (" BDATE ")\n", my_name); + ua->send_msg(_("%s Version: %s (%s) %s %s %s %s\n"), my_name, VERSION, BDATE, + NPRTB(director->verid), HOST_OS, DISTNAME, DISTVER); return 1; } +#else +/* + * Test code -- turned on only for debug testing + */ +static int version_cmd(UAContext *ua, const char *cmd) +{ + dbid_list ids; + POOL_MEM query(PM_MESSAGE); + open_db(ua); + Mmsg(query, "select MediaId from Media,Pool where Pool.PoolId=Media.PoolId and Pool.Name='Full'"); + db_get_query_dbids(ua->jcr, ua->db, query, ids); + ua->send_msg("num_ids=%d max_ids=%d tot_ids=%d\n", ids.num_ids, ids.max_ids, ids.tot_ids); + for (int i=0; i < ids.num_ids; i++) { + ua->send_msg("id=%d\n", ids.DBId[i]); + } + close_db(ua); + return 1; +} +#endif + +/* + * 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 = GetCatalogResWithName(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 = GetClientResWithName(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 = GetJobResWithName(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); +} -/* A bit brain damaged in that if the user has not done - * a "use catalog xxx" command, we simply find the first - * catalog resource and open it. +/* + * Open the catalog database. */ -int open_db(UAContext *ua) +bool open_db(UAContext *ua) { if (ua->db) { - return 1; + return true; } if (!ua->catalog) { - LockRes(); - ua->catalog = (CAT *)GetNextRes(R_CATALOG, NULL); - UnlockRes(); - if (!ua->catalog) { - bsendmsg(ua, _("Could not find a Catalog resource\n")); - return 0; - } else { - bsendmsg(ua, _("Using default Catalog name=%s DB=%s\n"), - ua->catalog->hdr.name, ua->catalog->db_name); + ua->catalog = get_catalog_resource(ua); + if (!ua->catalog) { + ua->error_msg( _("Could not find a Catalog resource\n")); + return false; } } ua->jcr->catalog = ua->catalog; - Dmsg0(150, "Open database\n"); - ua->db = db_init_database(ua->jcr, ua->catalog->db_name, ua->catalog->db_user, - ua->catalog->db_password, ua->catalog->db_address, - ua->catalog->db_port, ua->catalog->db_socket); + Dmsg0(100, "UA Open database\n"); + ua->db = db_init(ua->jcr, ua->catalog->db_driver, ua->catalog->db_name, + ua->catalog->db_user, + ua->catalog->db_password, ua->catalog->db_address, + 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->catalog->db_name); + 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 0; + 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 1; + return true; } void close_db(UAContext *ua) @@ -2016,7 +1957,7 @@ void close_db(UAContext *ua) db_close_database(ua->jcr, ua->db); ua->db = NULL; if (ua->jcr) { - ua->jcr->db = NULL; + ua->jcr->db = NULL; } } }