summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Zezeski <rpz@joyent.com>2017-01-04 06:21:01 -0700
committerRyan Zezeski <rpz@joyent.com>2017-01-31 08:46:50 -0700
commit0e21e957f7ee4ef75f79e71f2fd6f09da211893d (patch)
treee8b2992b5857e3e4fb11335e377f1f468a09707f
parentca8c1f45695962c5f0fcafb697b9a4799e47ec9e (diff)
downloadillumos-joyent-0e21e957f7ee4ef75f79e71f2fd6f09da211893d.tar.gz
OS-1457 dladm won't show or create vnics
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com> Approved by: Jerry Jelinek <jerry.jelinek@joyent.com>
-rw-r--r--usr/src/cmd/dlmgmtd/dlmgmt_door.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/usr/src/cmd/dlmgmtd/dlmgmt_door.c b/usr/src/cmd/dlmgmtd/dlmgmt_door.c
index f2de893b98..2bebaa24c3 100644
--- a/usr/src/cmd/dlmgmtd/dlmgmt_door.c
+++ b/usr/src/cmd/dlmgmtd/dlmgmt_door.c
@@ -21,7 +21,7 @@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2016 Joyent, Inc.
+ * Copyright 2017 Joyent, Inc.
*/
/*
@@ -1242,8 +1242,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;
}