[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 50/57] qemu-bridge-helper: relocate path to default ACL
From: |
Paolo Bonzini |
Subject: |
[PULL 50/57] qemu-bridge-helper: relocate path to default ACL |
Date: |
Sat, 19 Sep 2020 11:59:09 -0400 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
qemu-bridge-helper.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/qemu-bridge-helper.c b/qemu-bridge-helper.c
index 88b26747fc..a26e1663f0 100644
--- a/qemu-bridge-helper.c
+++ b/qemu-bridge-helper.c
@@ -40,6 +40,7 @@
#endif
#include "qemu/queue.h"
+#include "qemu/cutils.h"
#include "net/tap-linux.h"
@@ -245,6 +246,7 @@ int main(int argc, char **argv)
ACLList acl_list;
int access_allowed, access_denied;
int ret = EXIT_SUCCESS;
+ g_autofree char *acl_file = NULL;
#ifdef CONFIG_LIBCAP_NG
/* if we're run from an suid binary, immediately drop privileges preserving
@@ -257,6 +259,8 @@ int main(int argc, char **argv)
}
#endif
+ qemu_init_exec_dir(argv[0]);
+
/* parse arguments */
for (index = 1; index < argc; index++) {
if (strcmp(argv[index], "--use-vnet") == 0) {
@@ -282,9 +286,10 @@ int main(int argc, char **argv)
/* parse default acl file */
QSIMPLEQ_INIT(&acl_list);
- if (parse_acl_file(DEFAULT_ACL_FILE, &acl_list) == -1) {
+ acl_file = get_relocated_path(DEFAULT_ACL_FILE);
+ if (parse_acl_file(acl_file, &acl_list) == -1) {
fprintf(stderr, "failed to parse default acl file `%s'\n",
- DEFAULT_ACL_FILE);
+ acl_file);
ret = EXIT_FAILURE;
goto cleanup;
}
--
2.26.2
- [PULL 22/57] hw/char/serial: Replace commented DPRINTF() by trace event, (continued)
- [PULL 22/57] hw/char/serial: Replace commented DPRINTF() by trace event, Paolo Bonzini, 2020/09/19
- [PULL 25/57] hw/char/serial: Make 'wakeup' property boolean, Paolo Bonzini, 2020/09/19
- [PULL 41/57] oslib: do not call g_strdup from qemu_get_exec_dir, Paolo Bonzini, 2020/09/19
- [PULL 56/57] checkpatch: avoid error on cover letter files, Paolo Bonzini, 2020/09/19
- [PULL 38/57] meson: qtest: set "depends" correctly, Paolo Bonzini, 2020/09/19
- [PULL 44/57] cutils: introduce get_relocated_path, Paolo Bonzini, 2020/09/19
- [PULL 34/57] configure: move malloc_trim/tcmalloc/jemalloc to meson, Paolo Bonzini, 2020/09/19
- [PULL 33/57] meson: extend libmpathpersist test for static linking, Paolo Bonzini, 2020/09/19
- [PULL 39/57] mtest2make: add support for introspected test dependencies, Paolo Bonzini, 2020/09/19
- [PULL 36/57] configure: move cocoa option to Meson, Paolo Bonzini, 2020/09/19
- [PULL 50/57] qemu-bridge-helper: relocate path to default ACL,
Paolo Bonzini <=
- [PULL 54/57] hw/i386/q35: Remove unreachable Xen code on Q35 machine, Paolo Bonzini, 2020/09/19
- [PULL 49/57] vl: relocate path to configuration file, Paolo Bonzini, 2020/09/19
- [PULL 48/57] vl: relocate paths to data directories, Paolo Bonzini, 2020/09/19
- [PULL 57/57] meson: fix installation of keymaps, Paolo Bonzini, 2020/09/19
- [PULL 55/57] exec: Remove MemoryRegion::global_locking field, Paolo Bonzini, 2020/09/19
- [PULL 27/57] scsi-generic: Fix HM-zoned device scan, Paolo Bonzini, 2020/09/19
- [PULL 30/57] i386/cpu: Clear FEAT_XSAVE_COMP_{LO, HI} when XSAVE is not available, Paolo Bonzini, 2020/09/19
- [PULL 46/57] module: relocate path to modules, Paolo Bonzini, 2020/09/19
- [PULL 37/57] configure: do not limit Hypervisor.framework test to Darwin, Paolo Bonzini, 2020/09/19
- [PULL 43/57] oslib-posix: default exec_dir to bindir, Paolo Bonzini, 2020/09/19