diff options
Diffstat (limited to 'usr/src/lib/libzonecfg/common/libzonecfg.c')
| -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 71da0ffb9a..6ae93b142e 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. * Copyright (c) 2013, Joyent Inc. All rights reserved. */ @@ -1778,7 +1779,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 @@ -2387,7 +2388,7 @@ zonecfg_delete_nwif_core(zone_dochandle_t handle, struct zone_nwiftab *tabptr) gnic_match = match_prop(cur, DTD_ATTR_GNIC, tabptr->zone_nwif_gnic); - if ((addr_match || allowed_addr_match || mac_match || + if (((addr_match && allowed_addr_match) || mac_match || gnic_match) && phys_match) { xmlUnlinkNode(cur); xmlFreeNode(cur); |