* 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 int r_first;
extern int r_last;
extern struct s_res resources[];
-extern char my_name[];
-extern const char *client_backups;
-extern int console_msg_pending;
/* Imported functions */
-extern int do_messages(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);
struct cmdstruct { const char *key; int (*func)(UAContext *ua, const char *cmd); const char *help; };
static struct cmdstruct commands[] = {
- { N_(".die"), diecmd, NULL},
- { N_(".jobs"), jobscmd, NULL},
- { N_(".filesets"), filesetscmd, NULL},
- { N_(".clients"), clientscmd, NULL},
- { N_(".msgs"), msgscmd, NULL},
- { N_(".pools"), poolscmd, NULL},
- { N_(".types"), typescmd, NULL},
- { N_(".backups"), backupscmd, NULL},
- { N_(".levels"), levelscmd, NULL},
- { N_(".status"), qstatus_cmd, NULL},
- { N_(".storage"), storagecmd, NULL},
- { N_(".defaults"), defaultscmd, NULL},
- { N_(".messages"), getmsgscmd, NULL},
- { N_(".help"), qhelp_cmd, NULL},
- { N_(".quit"), quit_cmd, NULL},
- { N_(".exit"), quit_cmd, NULL}
+ { NT_(".die"), diecmd, NULL},
+ { NT_(".jobs"), jobscmd, NULL},
+ { NT_(".filesets"), filesetscmd, NULL},
+ { NT_(".clients"), clientscmd, NULL},
+ { NT_(".msgs"), msgscmd, NULL},
+ { NT_(".pools"), poolscmd, NULL},
+ { NT_(".types"), typescmd, NULL},
+ { NT_(".backups"), backupscmd, NULL},
+ { NT_(".levels"), levelscmd, NULL},
+ { NT_(".status"), qstatus_cmd, NULL},
+ { NT_(".storage"), storagecmd, NULL},
+ { NT_(".defaults"), defaultscmd, NULL},
+ { NT_(".messages"), getmsgscmd, NULL},
+ { NT_(".help"), qhelp_cmd, NULL},
+ { NT_(".quit"), quit_cmd, NULL},
+ { NT_(".exit"), quit_cmd, NULL}
};
#define comsize (sizeof(commands)/sizeof(struct cmdstruct))
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 (ua->argc != 3 || strcmp(ua->argk[1], "client") != 0 || strcmp(ua->argk[2], "fileset") != 0) {
return 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 default values for a job
*/
STORE *storage;
POOL *pool;
+ if (ua->argc != 2 || !ua->argv[1]) {
+ return 1;
+ }
+
/* Job defaults */
- if (ua->argc == 2 && strcmp(ua->argk[1], "job") == 0) {
+ 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(ua->argc == 2 && strcmp(ua->argk[1], "client") == 0) {
+ 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);
}
}
/* Storage defaults */
- else if(ua->argc == 2 && strcmp(ua->argk[1], "storage") == 0) {
+ 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 = (DEVICE *)storage->device->first();
+ 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);
+ if (storage->device->size() > 1) {
+ while ((device = (DEVICE *)storage->device->next()))
+ bsendmsg(ua, ",%s", device->hdr.name);
+ }
}
}
/* Pool defaults */
- else if(ua->argc == 2 && strcmp(ua->argk[1], "pool") == 0) {
+ 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);
+ 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);
projects / bacula / bacula / blobdiff