diff options
| author | Gary Mills <gary_mills@fastmail.fm> | 2014-07-09 11:03:22 -0500 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2014-07-14 08:36:04 -0700 |
| commit | 5e74f94d8c2a16c2ef7cf2940a157ffabb379c27 (patch) | |
| tree | 5bb0cecb0333fb2e80befb89d763b8eb28c2f1f9 /usr/src/lib | |
| parent | 5a81b4ad6a940aead6f0789e059a6f8fbc678be0 (diff) | |
| download | illumos-joyent-5e74f94d8c2a16c2ef7cf2940a157ffabb379c27.tar.gz | |
3347 zonecfg(1M) is confused about selection
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr/src/lib')
| -rw-r--r-- | usr/src/lib/libzonecfg/common/libzonecfg.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr/src/lib/libzonecfg/common/libzonecfg.c b/usr/src/lib/libzonecfg/common/libzonecfg.c index 7b2a1f014f..6ae73b9f3b 100644 --- a/usr/src/lib/libzonecfg/common/libzonecfg.c +++ b/usr/src/lib/libzonecfg/common/libzonecfg.c @@ -20,6 +20,7 @@ */ /* + * Copyright 2014 Gary Mills * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. */ @@ -1767,7 +1768,7 @@ match_prop(xmlNodePtr cur, const xmlChar *attr, char *user_prop) return (B_FALSE); prop_result = xmlStrcmp(gotten_prop, (const xmlChar *) user_prop); xmlFree(gotten_prop); - return ((prop_result == 0)); + return ((prop_result == 0)); /* empty strings will match */ } static int @@ -2255,7 +2256,7 @@ zonecfg_delete_nwif_core(zone_dochandle_t handle, struct zone_nwiftab *tabptr) phys_match = match_prop(cur, DTD_ATTR_PHYSICAL, tabptr->zone_nwif_physical); - if ((addr_match || allowed_addr_match) && phys_match) { + if (addr_match && allowed_addr_match && phys_match) { xmlUnlinkNode(cur); xmlFreeNode(cur); return (Z_OK); |