1
Description: Make dump_resource respect console ACL's
4
Author: Kern Sibbald <kern@sibbald.com>
5
Last-Update: 2012-09-17
7
diff --git a/src/dird/dird_conf.c b/src/dird/dird_conf.c
8
index 7dcf591..2f2eb00 100644
9
--- a/src/dird/dird_conf.c
10
+++ b/src/dird/dird_conf.c
11
@@ -554,6 +554,7 @@ void dump_resource(int type, RES *reshdr, void sendit(void *sock, const char *fm
13
char ed1[100], ed2[100], ed3[100];
15
+ UAContext *ua = (UAContext *)sock;
18
sendit(sock, _("No %s resource defined\n"), res_to_str(type));
19
@@ -599,6 +600,9 @@ void dump_resource(int type, RES *reshdr, void sendit(void *sock, const char *fm
23
+ if (!acl_access_ok(ua, Client_ACL, res->res_client.hdr.name)) {
26
sendit(sock, _("Client: name=%s address=%s FDport=%d MaxJobs=%u\n"),
27
res->res_client.hdr.name, res->res_client.address, res->res_client.FDport,
28
res->res_client.MaxConcurrentJobs);
29
@@ -626,6 +630,9 @@ void dump_resource(int type, RES *reshdr, void sendit(void *sock, const char *fm
33
+ if (!acl_access_ok(ua, Storage_ACL, res->res_store.hdr.name)) {
36
sendit(sock, _("Storage: name=%s address=%s SDport=%d MaxJobs=%u\n"
37
" DeviceName=%s MediaType=%s StorageId=%s\n"),
38
res->res_store.hdr.name, res->res_store.address, res->res_store.SDport,
39
@@ -636,6 +643,9 @@ void dump_resource(int type, RES *reshdr, void sendit(void *sock, const char *fm
43
+ if (!acl_access_ok(ua, Catalog_ACL, res->res_cat.hdr.name)) {
46
sendit(sock, _("Catalog: name=%s address=%s DBport=%d db_name=%s\n"
47
" db_driver=%s db_user=%s MutliDBConn=%d\n"),
48
res->res_cat.hdr.name, NPRT(res->res_cat.db_address),
49
@@ -646,6 +656,9 @@ void dump_resource(int type, RES *reshdr, void sendit(void *sock, const char *fm
53
+ if (!acl_access_ok(ua, Job_ACL, res->res_job.hdr.name)) {
56
sendit(sock, _("%s: name=%s JobType=%d level=%s Priority=%d Enabled=%d\n"),
57
type == R_JOB ? _("Job") : _("JobDefs"),
58
res->res_job.hdr.name, res->res_job.JobType,
59
@@ -767,6 +780,9 @@ void dump_resource(int type, RES *reshdr, void sendit(void *sock, const char *fm
63
+ if (!acl_access_ok(ua, FileSet_ACL, res->res_fs.hdr.name)) {
66
sendit(sock, _("FileSet: name=%s\n"), res->res_fs.hdr.name);
67
for (i=0; i<res->res_fs.num_includes; i++) {
68
INCEXE *incexe = res->res_fs.include_items[i];
69
@@ -854,6 +870,9 @@ void dump_resource(int type, RES *reshdr, void sendit(void *sock, const char *fm
73
+ if (!acl_access_ok(ua, Schedule_ACL, res->res_sch.hdr.name)) {
76
if (res->res_sch.run) {
78
RUN *run = res->res_sch.run;
79
@@ -942,6 +961,9 @@ next_run:
83
+ if (!acl_access_ok(ua, Pool_ACL, res->res_pool.hdr.name)) {
86
sendit(sock, _("Pool: name=%s PoolType=%s\n"), res->res_pool.hdr.name,
87
res->res_pool.pool_type);
88
sendit(sock, _(" use_cat=%d use_once=%d cat_files=%d\n"),
89
diff --git a/src/tools/Makefile.in b/bacula/src/tools/Makefile.in
90
index 0c3f305..5731140 100644
91
--- a/src/tools/Makefile.in
92
+++ b/src/tools/Makefile.in
93
@@ -29,12 +29,12 @@ dummy:
95
GETTEXT_LIBS = @LIBINTL@
97
-FINDOBJS = testfind.o ../dird/dird_conf.o ../dird/inc_conf.o ../dird/run_conf.o
98
+FINDOBJS = testfind.o ../dird/dird_conf.o ../dird/inc_conf.o ../dird/ua_acl.o ../dird/run_conf.o
100
# these are the objects that are changed by the .configure process
101
EXTRAOBJS = @OBJLIST@
103
-DIRCONFOBJS = ../dird/dird_conf.o ../dird/run_conf.o ../dird/inc_conf.o
104
+DIRCONFOBJS = ../dird/dird_conf.o ../dird/ua_acl.o ../dird/run_conf.o ../dird/inc_conf.o
107
DIRTOOLS = bsmtp dbcheck drivetype fstype testfind testls bregex bwild bbatch bregtest bvfs_test ing_test
108
@@ -79,6 +79,9 @@ drivetype: Makefile drivetype.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../findlib/
109
dird_conf.o: ../dird/dird_conf.c
110
$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
112
+ua_acl.o: ../dird/ua_acl.c
113
+ $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
115
run_conf.o: ../dird/run_conf.c
116
$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<