NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

security: aa-helper: Remove the -p parameter

Browse Source 
As the aa-helper binary is supposed to be used only with libvirt, we can
fully remove it.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2018-06-04 09:00:47 +02:00
parent 10bc2127c3
commit abccb2fdeb
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/security/virt-aa-helper.c
View File

@ -63,7 +63,6 @@
static char *progname; static char *progname;
typedef struct { typedef struct {
bool allowDiskFormatProbing;
char uuid[PROFILE_NAME_SIZE]; /* UUID of vm */ char uuid[PROFILE_NAME_SIZE]; /* UUID of vm */
bool dryrun; /* dry run */ bool dryrun; /* dry run */
char cmd; /* 'c' create char cmd; /* 'c' create
@ -115,7 +114,6 @@ vah_usage(void)
" -r | --replace reload profile\n" " -r | --replace reload profile\n"
" -R | --remove unload profile\n" " -R | --remove unload profile\n"
" -h | --help this help\n" " -h | --help this help\n"
" -p | --probing [0|1] allow disk format probing\n"
" -u | --uuid <uuid> uuid (profile name)\n" " -u | --uuid <uuid> uuid (profile name)\n"
"\n"), progname); "\n"), progname);
@ -975,10 +973,8 @@ get_files(vahControl * ctl)
/* XXX - if we knew the qemu user:group here we could send it in /* XXX - if we knew the qemu user:group here we could send it in
* so that the open could be re-tried as that user:group. * so that the open could be re-tried as that user:group.
*/ */
if (!virStorageSourceHasBacking(disk->src)) { if (!virStorageSourceHasBacking(disk->src))
bool probe = ctl->allowDiskFormatProbing; virStorageFileGetMetadata(disk->src, -1, -1, false, false);
virStorageFileGetMetadata(disk->src, -1, -1, probe, false);
}
/* XXX passing ignoreOpenFailure = true to get back to the behavior /* XXX passing ignoreOpenFailure = true to get back to the behavior
* from before using virDomainDiskDefForeachPath. actually we should * from before using virDomainDiskDefForeachPath. actually we should
@ -1228,7 +1224,6 @@ vahParseArgv(vahControl * ctl, int argc, char **argv)
{ {
int arg, idx = 0; int arg, idx = 0;
struct option opt[] = { struct option opt[] = {
{"probing", 1, 0, 'p' },
{"add", 0, 0, 'a'}, {"add", 0, 0, 'a'},
{"create", 0, 0, 'c'}, {"create", 0, 0, 'c'},
{"dryrun", 0, 0, 'd'}, {"dryrun", 0, 0, 'd'},
@ -1280,12 +1275,6 @@ vahParseArgv(vahControl * ctl, int argc, char **argv)
PROFILE_NAME_SIZE) == NULL) PROFILE_NAME_SIZE) == NULL)
vah_error(ctl, 1, _("error copying UUID")); vah_error(ctl, 1, _("error copying UUID"));
break; break;
case 'p':
if (STREQ(optarg, "1"))
ctl->allowDiskFormatProbing = true;
else
ctl->allowDiskFormatProbing = false;
break;
default: default:
vah_error(ctl, 1, _("unsupported option")); vah_error(ctl, 1, _("unsupported option"));
break; break;