/*
- 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 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 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(R) - The Network Backup Solution
+
+ Copyright (C) 2000-2015 Kern Sibbald
+ Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+
+ The original author of Bacula is Kern Sibbald, with contributions
+ from many others, a complete list can be found in the file AUTHORS.
+
+ You may use this file and others of this release according to the
+ license defined in the LICENSE file, which includes the Affero General
+ Public License, v3.0 ("AGPLv3") and some additional permissions and
+ terms pursuant to its AGPLv3 Section 7.
+
+ This notice must be preserved when any source code is
+ conveyed and/or propagated.
+
+ Bacula(R) is a registered trademark of Kern Sibbald.
*/
/*
*
* I.e. messages, listing database, showing resources, ...
*
* Kern Sibbald, September MM
- *
- * Version $Id$
*/
#include "bacula.h"
/* Imported subroutines */
/* Imported variables */
-extern int r_first;
-extern int r_last;
-extern RES_TABLE resources[];
-extern RES **res_head;
/* Imported functions */
return 1;
}
-
+/*
+ * Enter with Resources locked
+ */
+static void show_disabled_jobs(UAContext *ua)
+{
+ JOB *job;
+ bool first = true;
+ foreach_res(job, R_JOB) {
+ if (!acl_access_ok(ua, Job_ACL, job->name())) {
+ continue;
+ }
+ if (!job->enabled) {
+ if (first) {
+ first = false;
+ ua->send_msg(_("Disabled Jobs:\n"));
+ }
+ ua->send_msg(" %s\n", job->name());
+ }
+ }
+ if (first) {
+ ua->send_msg(_("No disabled Jobs.\n"));
+ }
+}
struct showstruct {const char *res_name; int type;};
static struct showstruct reses[] = {
* show all
* show <resource-keyword-name> e.g. show directors
* show <resource-keyword-name>=<name> e.g. show director=HeadMan
+ * show disabled shows disabled jobs
*
*/
int show_cmd(UAContext *ua, const char *cmd)
LockRes();
for (i=1; i<ua->argc; i++) {
+ if (strcasecmp(ua->argk[i], NT_("disabled")) == 0) {
+ show_disabled_jobs(ua);
+ goto bail_out;
+ }
+
type = 0;
+
res_name = ua->argk[i];
if (!ua->argv[i]) { /* was a name given? */
/* No name, dump all resources of specified type */
recurse = 1;
len = strlen(res_name);
for (j=0; reses[j].res_name; j++) {
- if (strncasecmp(res_name, _(reses[j].res_name), len) == 0) {
+ if (strncasecmp(res_name, reses[j].res_name, len) == 0) {
type = reses[j].type;
if (type > 0) {
res = res_head[type-r_first];
recurse = 0;
len = strlen(res_name);
for (j=0; reses[j].res_name; j++) {
- if (strncasecmp(res_name, _(reses[j].res_name), len) == 0) {
+ if (strncasecmp(res_name, reses[j].res_name, len) == 0) {
type = reses[j].type;
res = (RES *)GetResWithName(type, ua->argv[i]);
if (!res) {
}
switch (type) {
- case -1: /* all */
+ /* All resources */
+ case -1:
for (j=r_first; j<=r_last; j++) {
- dump_resource(j, res_head[j-r_first], bsendmsg, ua);
+ /* Skip R_DEVICE since it is really not used or updated */
+ if (j != R_DEVICE) {
+ dump_resource(j, res_head[j-r_first], bsendmsg, ua);
+ }
}
break;
+ /* Help */
case -2:
ua->send_msg(_("Keywords for the show command are:\n"));
for (j=0; reses[j].res_name; j++) {
- ua->error_msg("%s\n", _(reses[j].res_name));
+ ua->error_msg("%s\n", reses[j].res_name);
}
goto bail_out;
+ /* Resource not found */
case -3:
ua->error_msg(_("%s resource %s not found.\n"), res_name, ua->argv[i]);
goto bail_out;
+ /* Resource not found */
case 0:
ua->error_msg(_("Resource %s not found\n"), res_name);
goto bail_out;
+ /* Dump a specific type */
default:
dump_resource(recurse?type:-type, res, bsendmsg, ua);
break;
return 1;
}
+/*
+ * Check if the access is permitted for a list of jobids
+ *
+ * Not in ua_acl.c because it's using db access, and tools such
+ * as bdirjson are not linked with cats.
+ */
+bool acl_access_jobid_ok(UAContext *ua, const char *jobids)
+{
+ char *tmp=NULL, *p;
+ bool ret=false;
+ JOB_DBR jr;
+ uint32_t jid;
+
+ if (!jobids) {
+ return false;
+ }
+
+ if (!is_a_number_list(jobids)) {
+ return false;
+ }
+ /* If no console resource => default console and all is permitted */
+ if (!ua || !ua->cons) {
+ Dmsg0(1400, "Root cons access OK.\n");
+ return true; /* No cons resource -> root console OK for everything */
+ }
+
+ alist *list = ua->cons->ACL_lists[Job_ACL];
+ if (!list) { /* empty list */
+ return false; /* List empty, reject everything */
+ }
+ /* Special case *all* gives full access */
+ if (list->size() == 1 && strcasecmp("*all*", (char *)list->get(0)) == 0) {
+ return true;
+ }
+
+ /* If we can't open the database, just say no */
+ if (!open_new_client_db(ua)) {
+ return false;
+ }
+
+ p = tmp = bstrdup(jobids);
+
+ while (get_next_jobid_from_list(&p, &jid) > 0) {
+ memset(&jr, 0, sizeof(jr));
+ jr.JobId = jid;
+
+ if (db_get_job_record(ua->jcr, ua->db, &jr)) {
+ for (int i=0; i<list->size(); i++) {
+ if (strcasecmp(jr.Name, (char *)list->get(i)) == 0) {
+ Dmsg3(1400, "ACL found %s in %d %s\n", jr.Name,
+ Job_ACL, (char *)list->get(i));
+ ret = true;
+ goto bail_out;
+ }
+ }
+ }
+ }
+
+bail_out:
+ if (tmp) {
+ free(tmp);
+ }
+ return ret;
+}
/*
* List contents of database
* list jobs - lists all jobs run
* list jobid=nnn - list job data for jobid
* list ujobid=uname - list job data for unique jobid
- * list job=name - list all jobs with "name"
- * list jobname=name - same as above
+ * list job=name - list all jobs with "name"
+ * list jobname=name - same as above
* list jobmedia jobid=<nn>
* list jobmedia job=name
+ * list joblog jobid=<nn>
+ * list joblog job=name
* list files jobid=<nn> - list files saved for job nn
* list files job=name
* list pools - list pool records
* list clients - list clients
* list nextvol job=xx - list the next vol to be used by job
* list nextvolume job=xx - same as above.
+ * list copies jobid=x,y,z
*
*/
POOL_DBR pr;
MEDIA_DBR mr;
- if (!open_client_db(ua))
+ if (!open_new_client_db(ua))
return 1;
memset(&jr, 0, sizeof(jr));
memset(&pr, 0, sizeof(pr));
- memset(&mr, 0, sizeof(mr));
Dmsg1(20, "list: %s\n", cmd);
ua->error_msg(_("Hey! DB is NULL\n"));
}
+ /* Apply any limit */
+ j = find_arg_with_value(ua, NT_("limit"));
+ if (j >= 0) {
+ jr.limit = atoi(ua->argv[j]);
+ }
+
/* Scan arguments looking for things to do */
for (i=1; i<ua->argc; i++) {
/* List JOBS */
if (strcasecmp(ua->argk[i], NT_("jobs")) == 0) {
- /* Apply any limit */
- j = find_arg_with_value(ua, NT_("limit"));
- if (j >= 0) {
- jr.limit = atoi(ua->argv[j]);
- }
db_list_job_records(ua->jcr, ua->db, &jr, prtit, ua, llist);
/* List JOBTOTALS */
jr.JobId = 0;
db_list_job_records(ua->jcr, ua->db, &jr, prtit, ua, llist);
+ /* List Base files */
+ } else if (strcasecmp(ua->argk[i], NT_("basefiles")) == 0) {
+ /* TODO: cleanup this block */
+ for (j=i+1; j<ua->argc; j++) {
+ if (strcasecmp(ua->argk[j], NT_("ujobid")) == 0 && ua->argv[j]) {
+ bstrncpy(jr.Job, ua->argv[j], MAX_NAME_LENGTH);
+ jr.JobId = 0;
+ db_get_job_record(ua->jcr, ua->db, &jr);
+ jobid = jr.JobId;
+ } else if (strcasecmp(ua->argk[j], NT_("jobid")) == 0 && ua->argv[j]) {
+ jobid = str_to_int64(ua->argv[j]);
+ } else {
+ continue;
+ }
+ if (jobid > 0) {
+ db_list_base_files_for_job(ua->jcr, ua->db, jobid, prtit, ua);
+ }
+ }
+
/* List FILES */
} else if (strcasecmp(ua->argk[i], NT_("files")) == 0) {
/* List JOBMEDIA */
} else if (strcasecmp(ua->argk[i], NT_("jobmedia")) == 0) {
- int done = FALSE;
+ bool done = false;
for (j=i+1; j<ua->argc; j++) {
if (strcasecmp(ua->argk[j], NT_("ujobid")) == 0 && ua->argv[j]) {
bstrncpy(jr.Job, ua->argv[j], MAX_NAME_LENGTH);
continue;
}
db_list_jobmedia_records(ua->jcr, ua->db, jobid, prtit, ua, llist);
- done = TRUE;
+ done = true;
}
if (!done) {
/* List for all jobs (jobid=0) */
db_list_jobmedia_records(ua->jcr, ua->db, 0, prtit, ua, llist);
}
+ /* List JOBLOG */
+ } else if (strcasecmp(ua->argk[i], NT_("joblog")) == 0) {
+ bool done = false;
+ for (j=i+1; j<ua->argc; j++) {
+ if (strcasecmp(ua->argk[j], NT_("ujobid")) == 0 && ua->argv[j]) {
+ bstrncpy(jr.Job, ua->argv[j], MAX_NAME_LENGTH);
+ jr.JobId = 0;
+ db_get_job_record(ua->jcr, ua->db, &jr);
+ jobid = jr.JobId;
+ } else if (strcasecmp(ua->argk[j], NT_("jobid")) == 0 && ua->argv[j]) {
+ jobid = str_to_int64(ua->argv[j]);
+ } else {
+ continue;
+ }
+ db_list_joblog_records(ua->jcr, ua->db, jobid, prtit, ua, llist);
+ done = true;
+ }
+ if (!done) {
+ /* List for all jobs (jobid=0) */
+ db_list_joblog_records(ua->jcr, ua->db, 0, prtit, ua, llist);
+ }
+
+
/* List POOLS */
} else if (strcasecmp(ua->argk[i], NT_("pool")) == 0 ||
strcasecmp(ua->argk[i], NT_("pools")) == 0) {
} else if (strcasecmp(ua->argk[i], NT_("clients")) == 0) {
db_list_client_records(ua->jcr, ua->db, prtit, ua, llist);
-
/* List MEDIA or VOLUMES */
} else if (strcasecmp(ua->argk[i], NT_("media")) == 0 ||
strcasecmp(ua->argk[i], NT_("volume")) == 0 ||
free_pool_memory(VolumeName);
done = true;
}
+
/* if no job or jobid keyword found, then we list all media */
if (!done) {
int num_pools;
uint32_t *ids;
/* List a specific volume? */
- if (ua->argv[i]) {
+ if (ua->argv[i] && *ua->argv[i]) {
bstrncpy(mr.VolumeName, ua->argv[i], sizeof(mr.VolumeName));
db_list_media_records(ua->jcr, ua->db, &mr, prtit, ua, llist);
return 1;
}
}
list_nextvol(ua, n);
+ } else if (strcasecmp(ua->argk[i], NT_("copies")) == 0) {
+ char *jobids = NULL;
+ uint32_t limit=0;
+ for (j=i+1; j<ua->argc; j++) {
+ if (strcasecmp(ua->argk[j], NT_("jobid")) == 0 && ua->argv[j]) {
+ if (is_a_number_list(ua->argv[j])) {
+ jobids = ua->argv[j];
+ }
+ } else if (strcasecmp(ua->argk[j], NT_("limit")) == 0 && ua->argv[j]) {
+ limit = atoi(ua->argv[j]);
+ }
+ }
+ db_list_copies_records(ua->jcr,ua->db,limit,jobids,prtit,ua,llist);
} else if (strcasecmp(ua->argk[i], NT_("limit")) == 0
|| strcasecmp(ua->argk[i], NT_("days")) == 0) {
/* Ignore it */
+ } else if (strcasecmp(ua->argk[i], NT_("snapshot")) == 0 ||
+ strcasecmp(ua->argk[i], NT_("snapshots")) == 0)
+ {
+ snapshot_list(ua, i, prtit, llist);
+ return 1;
+
} else {
ua->error_msg(_("Unknown list keyword: %s\n"), NPRT(ua->argk[i]));
}
static bool list_nextvol(UAContext *ua, int ndays)
{
JOB *job;
- JCR *jcr = ua->jcr;
+ JCR *jcr;
USTORE store;
RUN *run;
- time_t runtime;
+ utime_t runtime;
bool found = false;
MEDIA_DBR mr;
POOL_DBR pr;
- memset(&mr, 0, sizeof(mr));
int i = find_arg_with_value(ua, "job");
if (i <= 0) {
if ((job = select_job_resource(ua)) == NULL) {
} else {
job = (JOB *)GetResWithName(R_JOB, ua->argv[i]);
if (!job) {
- Jmsg(jcr, M_ERROR, 0, _("%s is not a job name.\n"), ua->argv[i]);
+ Jmsg(ua->jcr, M_ERROR, 0, _("%s is not a job name.\n"), ua->argv[i]);
if ((job = select_job_resource(ua)) == NULL) {
return false;
}
}
}
+
+ jcr = new_jcr(sizeof(JCR), dird_free_jcr);
for (run=NULL; (run = find_next_run(run, job, runtime, ndays)); ) {
if (!complete_jcr_for_job(jcr, job, run->pool)) {
- return false;
+ found = false;
+ goto get_out;
}
if (!jcr->jr.PoolId) {
- ua->error_msg(_("Could not Pool Job %s\n"), job->name());
+ ua->error_msg(_("Could not find Pool for Job %s\n"), job->name());
continue;
}
memset(&pr, 0, sizeof(pr));
pr.PoolId = jcr->jr.PoolId;
- if (!db_get_pool_record(ua->jcr, ua->db, &pr)) {
+ if (!db_get_pool_record(jcr, jcr->db, &pr)) {
bstrncpy(pr.Name, "*UnknownPool*", sizeof(pr.Name));
}
mr.PoolId = jcr->jr.PoolId;
get_job_storage(&store, job, run);
- mr.StorageId = store.store->StorageId;
+ set_storageid_in_mr(store.store, &mr);
+ /* no need to set ScratchPoolId, since we use fnv_no_create_vol */
if (!find_next_volume_for_append(jcr, &mr, 1, fnv_no_create_vol, fnv_prune)) {
ua->error_msg(_("Could not find next Volume for Job %s (Pool=%s, Level=%s).\n"),
job->name(), pr.Name, level_to_str(run->level));
job->name(), pr.Name, level_to_str(run->level), mr.VolumeName);
found = true;
}
- if (jcr->db && jcr->db != ua->db) {
- db_close_database(jcr, jcr->db);
- jcr->db = NULL;
- }
}
+
+get_out:
+ if (jcr->db) db_close_database(jcr, jcr->db);
+ jcr->db = NULL;
+ free_jcr(jcr);
if (!found) {
ua->error_msg(_("Could not find next Volume for Job %s.\n"),
job->hdr.name);
* For a given job, we examine all his run records
* to see if it is scheduled today or tomorrow.
*/
-RUN *find_next_run(RUN *run, JOB *job, time_t &runtime, int ndays)
+RUN *find_next_run(RUN *run, JOB *job, utime_t &runtime, int ndays)
{
time_t now, future, endtime;
SCHED *sched;
struct tm tm, runtm;
int mday, wday, month, wom, i;
- int woy;
+ int woy, ldom;
int day;
- int is_scheduled;
+ bool is_scheduled;
sched = job->schedule;
- if (sched == NULL) { /* scheduled? */
+ if (!sched || !job->enabled || (sched && !sched->enabled) ||
+ (job->client && !job->client->enabled)) {
return NULL; /* no nothing to report */
}
month = tm.tm_mon;
wom = mday / 7;
woy = tm_woy(future);
+ ldom = tm_ldom(month, tm.tm_year + 1900);
+
+ is_scheduled = (bit_is_set(mday, run->mday) &&
+ bit_is_set(wday, run->wday) &&
+ bit_is_set(month, run->month) &&
+ bit_is_set(wom, run->wom) &&
+ bit_is_set(woy, run->woy)) ||
+ (bit_is_set(month, run->month) &&
+ bit_is_set(31, run->mday) && mday == ldom);
- is_scheduled = bit_is_set(mday, run->mday) && bit_is_set(wday, run->wday) &&
- bit_is_set(month, run->month) && bit_is_set(wom, run->wom) &&
- bit_is_set(woy, run->woy);
-
#ifdef xxx
- Dmsg2(000, "day=%d is_scheduled=%d\n", day, is_scheduled);
- Dmsg1(000, "bit_set_mday=%d\n", bit_is_set(mday, run->mday));
- Dmsg1(000, "bit_set_wday=%d\n", bit_is_set(wday, run->wday));
- Dmsg1(000, "bit_set_month=%d\n", bit_is_set(month, run->month));
- Dmsg1(000, "bit_set_wom=%d\n", bit_is_set(wom, run->wom));
- Dmsg1(000, "bit_set_woy=%d\n", bit_is_set(woy, run->woy));
+ Pmsg2(000, "day=%d is_scheduled=%d\n", day, is_scheduled);
+ Pmsg1(000, "bit_set_mday=%d\n", bit_is_set(mday, run->mday));
+ Pmsg1(000, "bit_set_wday=%d\n", bit_is_set(wday, run->wday));
+ Pmsg1(000, "bit_set_month=%d\n", bit_is_set(month, run->month));
+ Pmsg1(000, "bit_set_wom=%d\n", bit_is_set(wom, run->wom));
+ Pmsg1(000, "bit_set_woy=%d\n", bit_is_set(woy, run->woy));
#endif
if (is_scheduled) { /* Jobs scheduled on that day */
}
}
bstrncat(buf, "\n", sizeof(buf));
- Dmsg1(000, "%s", buf);
+ Pmsg1(000, "%s", buf);
#endif
/* find time (time_t) job is to be run */
(void)localtime_r(&future, &runtm);
runtm.tm_min = run->minute;
runtm.tm_sec = 0;
runtime = mktime(&runtm);
- Dmsg2(200, "now=%d runtime=%d\n", now, runtime);
+ Dmsg2(200, "now=%d runtime=%lld\n", now, runtime);
if ((runtime > now) && (runtime < endtime)) {
Dmsg2(200, "Found it level=%d %c\n", run->level, run->level);
return run; /* found it, return run resource */
}
Dmsg0(100, "complete_jcr open db\n");
- jcr->db = jcr->db=db_init_database(jcr, jcr->catalog->db_name, jcr->catalog->db_user,
- jcr->catalog->db_password, jcr->catalog->db_address,
- jcr->catalog->db_port, jcr->catalog->db_socket,
- jcr->catalog->mult_db_connections);
+ jcr->db = db_init_database(jcr, jcr->catalog->db_driver, jcr->catalog->db_name,
+ jcr->catalog->db_user,
+ jcr->catalog->db_password, jcr->catalog->db_address,
+ jcr->catalog->db_port, jcr->catalog->db_socket,
+ jcr->catalog->mult_db_connections,
+ jcr->catalog->disable_batch_insert);
if (!jcr->db || !db_open_database(jcr, jcr->db)) {
Jmsg(jcr, M_FATAL, 0, _("Could not open database \"%s\".\n"),
jcr->catalog->db_name);
int mlen;
bool do_truncate = false;
+ if (ua->jcr) {
+ dequeue_messages(ua->jcr);
+ }
Pw(con_lock);
pthread_cleanup_push(con_lock_release, (void *)NULL);
rewind(con_fd);
ua->UA_sock->msg = check_pool_memory_size(ua->UA_sock->msg, mlen+1);
strcpy(ua->UA_sock->msg, msg);
ua->UA_sock->msglen = mlen;
- bnet_send(ua->UA_sock);
+ ua->UA_sock->send();
do_truncate = true;
}
if (do_truncate) {
if (console_msg_pending) {
do_messages(ua, cmd);
} else {
- bnet_fsend(ua->UA_sock, _("You have no messages.\n"));
+ ua->UA_sock->fsend(_("You have no messages.\n"));
}
return 1;
}
{
UAContext *ua = (UAContext *)ctx;
- bnet_fsend(ua->UA_sock, "%s", msg);
+ if (ua) ua->send_msg("%s", msg);
}
/*
* agent, so we are being called from Bacula core. In
* that case direct the messages to the Job.
*/
+#ifdef HAVE_VA_COPY
void bmsg(UAContext *ua, const char *fmt, va_list arg_ptr)
{
BSOCK *bs = ua->UA_sock;
int maxlen, len;
- POOLMEM *msg;
+ POOLMEM *msg = NULL;
+ va_list ap;
if (bs) {
msg = bs->msg;
- } else {
+ }
+ if (!msg) {
msg = get_pool_memory(PM_EMSG);
}
again:
maxlen = sizeof_pool_memory(msg) - 1;
- len = bvsnprintf(msg, maxlen, fmt, arg_ptr);
+ va_copy(ap, arg_ptr);
+ len = bvsnprintf(msg, maxlen, fmt, ap);
+ va_end(ap);
if (len < 0 || len >= maxlen) {
msg = realloc_pool_memory(msg, maxlen + maxlen/2);
goto again;
if (bs) {
bs->msg = msg;
bs->msglen = len;
- bnet_send(bs);
+ bs->send();
} else { /* No UA, send to Job */
Jmsg(ua->jcr, M_INFO, 0, "%s", msg);
free_pool_memory(msg);
}
}
-
+
+#else /* no va_copy() -- brain damaged version of variable arguments */
+
+void bmsg(UAContext *ua, const char *fmt, va_list arg_ptr)
+{
+ BSOCK *bs = ua->UA_sock;
+ int maxlen, len;
+ POOLMEM *msg = NULL;
+
+ if (bs) {
+ msg = bs->msg;
+ }
+ if (!msg) {
+ msg = get_memory(5000);
+ }
+
+ maxlen = sizeof_pool_memory(msg) - 1;
+ if (maxlen < 4999) {
+ msg = realloc_pool_memory(msg, 5000);
+ maxlen = 4999;
+ }
+ len = bvsnprintf(msg, maxlen, fmt, arg_ptr);
+ if (len < 0 || len >= maxlen) {
+ pm_strcpy(msg, _("Message too long to display.\n"));
+ len = strlen(msg);
+ }
+
+ if (bs) {
+ bs->msg = msg;
+ bs->msglen = len;
+ bs->send();
+ } else { /* No UA, send to Job */
+ Jmsg(ua->jcr, M_INFO, 0, "%s", msg);
+ free_pool_memory(msg);
+ }
+
+}
+#endif
+
void bsendmsg(void *ctx, const char *fmt, ...)
{
va_list arg_ptr;
* programs
*/
/*
- * This is a message that should be displayed on the user's
+ * This is a message that should be displayed on the user's
* console.
*/
void UAContext::send_msg(const char *fmt, ...)
{
BSOCK *bs = UA_sock;
va_list arg_ptr;
- va_start(arg_ptr, fmt);
+
if (bs && api) bs->signal(BNET_ERROR_MSG);
+ va_start(arg_ptr, fmt);
bmsg(this, fmt, arg_ptr);
va_end(arg_ptr);
}
-/*
+/*
* This is a warning message, that should bring up a warning
* dialog box on the GUI. The command is not aborted, but something
* went wrong.
{
BSOCK *bs = UA_sock;
va_list arg_ptr;
- va_start(arg_ptr, fmt);
+
if (bs && api) bs->signal(BNET_WARNING_MSG);
+ va_start(arg_ptr, fmt);
bmsg(this, fmt, arg_ptr);
va_end(arg_ptr);
}
-/*
+/*
* This is an information message that should probably be put
* into the status line of a GUI program.
*/
{
BSOCK *bs = UA_sock;
va_list arg_ptr;
- va_start(arg_ptr, fmt);
+
if (bs && api) bs->signal(BNET_INFO_MSG);
+ va_start(arg_ptr, fmt);
bmsg(this, fmt, arg_ptr);
va_end(arg_ptr);
}
projects / bacula / bacula / blobdiff