* Version $Id$
*/
/*
- Copyright (C) 2002-2005 Kern Sibbald
+ Copyright (C) 2002-2006 Kern Sibbald
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
extern struct s_res resources[];
extern char my_name[];
extern const char *client_backups;
+extern int console_msg_pending;
/* Imported functions */
-extern int qmessagescmd(UAContext *ua, const char *cmd);
+extern void do_messages(UAContext *ua, const char *cmd);
extern int quit_cmd(UAContext *ua, const char *cmd);
extern int qhelp_cmd(UAContext *ua, const char *cmd);
extern int qstatus_cmd(UAContext *ua, const char *cmd);
static int typescmd(UAContext *ua, const char *cmd);
static int backupscmd(UAContext *ua, const char *cmd);
static int levelscmd(UAContext *ua, const char *cmd);
+static int getmsgscmd(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_(".status"), qstatus_cmd, NULL},
{ N_(".storage"), storagecmd, NULL},
{ N_(".defaults"), defaultscmd, NULL},
- { N_(".messages"), qmessagescmd, NULL},
+ { N_(".messages"), getmsgscmd, NULL},
{ N_(".help"), qhelp_cmd, NULL},
{ N_(".quit"), quit_cmd, NULL},
{ N_(".exit"), quit_cmd, NULL}
return stat;
}
+static int getmsgscmd(UAContext *ua, const char *cmd)
+{
+ if (console_msg_pending) {
+ do_messages(ua, cmd);
+ }
+ return 1;
+}
+
/*
* Create segmentation fault
*/
JOB *job = NULL;
LockRes();
while ( (job = (JOB *)GetNextRes(R_JOB, (RES *)job)) ) {
- bsendmsg(ua, "%s\n", job->hdr.name);
+ if (acl_access_ok(ua, Job_ACL, job->hdr.name)) {
+ bsendmsg(ua, "%s\n", job->hdr.name);
+ }
}
UnlockRes();
return 1;
FILESET *fs = NULL;
LockRes();
while ( (fs = (FILESET *)GetNextRes(R_FILESET, (RES *)fs)) ) {
- bsendmsg(ua, "%s\n", fs->hdr.name);
+ if (acl_access_ok(ua, FileSet_ACL, fs->hdr.name)) {
+ bsendmsg(ua, "%s\n", fs->hdr.name);
+ }
}
UnlockRes();
return 1;
CLIENT *client = NULL;
LockRes();
while ( (client = (CLIENT *)GetNextRes(R_CLIENT, (RES *)client)) ) {
- bsendmsg(ua, "%s\n", client->hdr.name);
+ if (acl_access_ok(ua, Client_ACL, client->hdr.name)) {
+ bsendmsg(ua, "%s\n", client->hdr.name);
+ }
}
UnlockRes();
return 1;
POOL *pool = NULL;
LockRes();
while ( (pool = (POOL *)GetNextRes(R_POOL, (RES *)pool)) ) {
- bsendmsg(ua, "%s\n", pool->hdr.name);
+ if (acl_access_ok(ua, Pool_ACL, pool->hdr.name)) {
+ bsendmsg(ua, "%s\n", pool->hdr.name);
+ }
}
UnlockRes();
return 1;
STORE *store = NULL;
LockRes();
while ( (store = (STORE *)GetNextRes(R_STORAGE, (RES *)store)) ) {
- bsendmsg(ua, "%s\n", store->hdr.name);
+ if (acl_access_ok(ua, Storage_ACL, store->hdr.name)) {
+ bsendmsg(ua, "%s\n", store->hdr.name);
+ }
}
UnlockRes();
return 1;
if (!open_db(ua)) {
return 1;
}
- if (ua->argc == 2 && strcmp(ua->argk[1], "client") != 0) {
+ if (ua->argc != 3 || strcmp(ua->argk[1], "client") != 0 || strcmp(ua->argk[2], "fileset") != 0) {
return 1;
}
- Mmsg(ua->cmd, client_backups, ua->argv[1]);
+ if (!acl_access_ok(ua, Client_ACL, ua->argv[1]) ||
+ !acl_access_ok(ua, FileSet_ACL, ua->argv[2])) {
+ return 1;
+ }
+ Mmsg(ua->cmd, client_backups, ua->argv[1], ua->argv[2]);
if (!db_sql_query(ua->db, ua->cmd, client_backups_handler, (void *)ua)) {
bsendmsg(ua, _("Query failed: %s. ERR=%s\n"), ua->cmd, db_strerror(ua->db));
return 1;
return 1;
}
-
-
/*
* Return default values for a job
*/
static int defaultscmd(UAContext *ua, const char *cmd)
{
JOB *job;
- if (ua->argc == 2 && strcmp(ua->argk[1], "job") == 0) {
+ CLIENT *client;
+ STORE *storage;
+ POOL *pool;
+
+ if (ua->argc != 2 || !ua->argv[1]) {
+ return 1;
+ }
+
+ /* Job defaults */
+ if (strcmp(ua->argk[1], "job") == 0) {
+ if (!acl_access_ok(ua, Job_ACL, ua->argv[1])) {
+ return 1;
+ }
job = (JOB *)GetResWithName(R_JOB, ua->argv[1]);
if (job) {
STORE *store;
bsendmsg(ua, "level=%s", level_to_str(job->JobLevel));
bsendmsg(ua, "type=%s", job_type_to_str(job->JobType));
bsendmsg(ua, "fileset=%s", job->fileset->hdr.name);
+ bsendmsg(ua, "enabled=%d", job->enabled);
}
+ }
+ /* Client defaults */
+ else if (strcmp(ua->argk[1], "client") == 0) {
+ if (!acl_access_ok(ua, Client_ACL, ua->argv[1])) {
+ return 1;
+ }
+ client = (CLIENT *)GetResWithName(R_CLIENT, ua->argv[1]);
+ if (client) {
+ bsendmsg(ua, "client=%s", client->hdr.name);
+ bsendmsg(ua, "address=%s", client->address);
+ bsendmsg(ua, "fdport=%d", client->FDport);
+ bsendmsg(ua, "file_retention=%d", client->FileRetention);
+ bsendmsg(ua, "job_retention=%d", client->JobRetention);
+ bsendmsg(ua, "autoprune=%d", client->AutoPrune);
+ }
+ }
+ /* Storage defaults */
+ else if (strcmp(ua->argk[1], "storage") == 0) {
+ if (!acl_access_ok(ua, Storage_ACL, ua->argv[1])) {
+ return 1;
+ }
+ storage = (STORE *)GetResWithName(R_STORAGE, ua->argv[1]);
+ DEVICE *device;
+ if (storage) {
+ bsendmsg(ua, "storage=%s", storage->hdr.name);
+ bsendmsg(ua, "address=%s", storage->address);
+ bsendmsg(ua, "enabled=%d", storage->enabled);
+ bsendmsg(ua, "media_type=%s", storage->media_type);
+ bsendmsg(ua, "sdport=%d", storage->SDport);
+ device = (DEVICE *)storage->device->first();
+ bsendmsg(ua, "device=%s", device->hdr.name);
+ if (storage->device->size() > 1) {
+ while ((device = (DEVICE *)storage->device->next()))
+ bsendmsg(ua, ",%s", device->hdr.name);
+ }
+ }
+ }
+ /* Pool defaults */
+ else if (strcmp(ua->argk[1], "pool") == 0) {
+ if (!acl_access_ok(ua, Pool_ACL, ua->argv[1])) {
+ return 1;
+ }
+ pool = (POOL *)GetResWithName(R_POOL, ua->argv[1]);
+ if (pool) {
+ bsendmsg(ua, "pool=%s", pool->hdr.name);
+ bsendmsg(ua, "pool_type=%s", pool->pool_type);
+ bsendmsg(ua, "label_format=%s", pool->label_format?pool->label_format:"");
+ bsendmsg(ua, "use_volume_once=%d", pool->use_volume_once);
+ bsendmsg(ua, "accept_any_volume=%d", pool->accept_any_volume);
+ bsendmsg(ua, "purge_oldest_volume=%d", pool->purge_oldest_volume);
+ bsendmsg(ua, "recycle_oldest_volume=%d", pool->recycle_oldest_volume);
+ bsendmsg(ua, "recycle_current_volume=%d", pool->recycle_current_volume);
+ bsendmsg(ua, "max_volumes=%d", pool->max_volumes);
+ bsendmsg(ua, "vol_retention=%d", pool->VolRetention);
+ bsendmsg(ua, "vol_use_duration=%d", pool->VolUseDuration);
+ bsendmsg(ua, "max_vol_jobs=%d", pool->MaxVolJobs);
+ bsendmsg(ua, "max_vol_files=%d", pool->MaxVolFiles);
+ bsendmsg(ua, "max_vol_bytes=%d", pool->MaxVolBytes);
+ bsendmsg(ua, "auto_prune=%d", pool->AutoPrune);
+ bsendmsg(ua, "recycle=%d", pool->Recycle);
+ }
}
return 1;
}
projects / bacula / bacula / blobdiff