From 0617d817b9a6060d315f707868c15f8e9e78a6c7 Mon Sep 17 00:00:00 2001 From: Dan McDonald Date: Mon, 24 Jul 2017 17:04:26 -0400 Subject: [PATCH] Revert "8437 dlmgmt_setzoneid() doesn't enforce uniqueness" (Breaks non-SmartOS distros' zone halt.) This reverts commit b2519362c825a494fb6e93549e2e32a425011563. --- usr/src/cmd/dlmgmtd/dlmgmt_door.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr/src/cmd/dlmgmtd/dlmgmt_door.c b/usr/src/cmd/dlmgmtd/dlmgmt_door.c index 8da1635bb6..11e4329669 100644 --- a/usr/src/cmd/dlmgmtd/dlmgmt_door.c +++ b/usr/src/cmd/dlmgmtd/dlmgmt_door.c @@ -21,7 +21,6 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2017 Joyent, Inc. */ /* @@ -1233,7 +1232,8 @@ 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 (link_by_name(linkp->ll_link, newzoneid) != NULL) { + if (zoneid != GLOBAL_ZONEID && + link_by_name(linkp->ll_link, newzoneid) != NULL) { err = EEXIST; goto done; } -- 2.11.4.GIT