summaryrefslogtreecommitdiff
path: root/usr/src/cmd/dlmgmtd
diff options
context:
space:
mode:
authorRyan Zezeski <rpz@joyent.com>2017-06-28 21:43:33 -0600
committerDan McDonald <danmcd@joyent.com>2017-07-07 11:46:33 -0400
commitb2519362c825a494fb6e93549e2e32a425011563 (patch)
tree7127284c402ec7b705bc30da540fa6af14663ae7 /usr/src/cmd/dlmgmtd
parent31c62b2533ba735118d04f02c094e23b6a18086c (diff)
downloadillumos-gate-b2519362c825a494fb6e93549e2e32a425011563.tar.gz
8437 dlmgmt_setzoneid() doesn't enforce uniqueness
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com> Reviewed by: Rich Lowe <richlowe@richlowe.net> Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/cmd/dlmgmtd')
-rw-r--r--usr/src/cmd/dlmgmtd/dlmgmt_door.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/cmd/dlmgmtd/dlmgmt_door.c b/usr/src/cmd/dlmgmtd/dlmgmt_door.c
index 11e4329669..8da1635bb6 100644
--- a/usr/src/cmd/dlmgmtd/dlmgmt_door.c
+++ b/usr/src/cmd/dlmgmtd/dlmgmt_door.c
@@ -21,6 +21,7 @@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2017 Joyent, Inc.
*/
/*
@@ -1232,8 +1233,7 @@ dlmgmt_setzoneid(void *argp, void *retp, size_t *sz, zoneid_t zoneid,
* Before we remove the link from its current zone, make sure that
* there isn't a link with the same name in the destination zone.
*/
- if (zoneid != GLOBAL_ZONEID &&
- link_by_name(linkp->ll_link, newzoneid) != NULL) {
+ if (link_by_name(linkp->ll_link, newzoneid) != NULL) {
err = EEXIST;
goto done;
}