summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorccardenas <ccardenas@cvs.openbsd.org>2017-11-30 01:28:28 +0000
committerccardenas <ccardenas@cvs.openbsd.org>2017-11-30 01:28:28 +0000
commit7348540a32e1b0c6cd6d51edcb66bd3abda02ecd (patch)
treec6e14f92d0bf2e8ce22d5bbb114b9080c5e87053 /usr.sbin
parentb784ae80857501931899fa9d979246b2b52133c9 (diff)
When performing vmctl reload and a previously configured vm is running,
exit with an EALREADY vs EPERM. ok mlarkin@
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/vmd/vmd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/vmd/vmd.c b/usr.sbin/vmd/vmd.c
index c6438dcf091..894709cb407 100644
--- a/usr.sbin/vmd/vmd.c
+++ b/usr.sbin/vmd/vmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmd.c,v 1.74 2017/11/11 02:50:07 mlarkin Exp $ */
+/* $OpenBSD: vmd.c,v 1.75 2017/11/30 01:28:27 ccardenas Exp $ */
/*
* Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
@@ -1101,7 +1101,7 @@ vm_register(struct privsep *ps, struct vmop_create_params *vmc,
if ((vm = vm_getbyname(vcp->vcp_name)) != NULL ||
(vm = vm_getbyvmid(vcp->vcp_id)) != NULL) {
- if (vm_checkperm(vm, uid) != 0 || vmc->vmc_flags != 0) {
+ if (vm_checkperm(vm, uid) != 0) {
errno = EPERM;
goto fail;
}