diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-07-14 18:15:43 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-07-14 18:15:43 +0000 |
| commit | bcc902ab131af782d25fde71a21d71ab2bccb677 (patch) | |
| tree | 4f4eb16f84eedc791b2a7f6adb73e9e281ca1bbb /usr/src/lib/libzonecfg/common/libzonecfg.c | |
| parent | 1bce44cb939839753c1f6934c0da4cfe42f02e44 (diff) | |
| parent | 5e74f94d8c2a16c2ef7cf2940a157ffabb379c27 (diff) | |
| download | illumos-joyent-bcc902ab131af782d25fde71a21d71ab2bccb677.tar.gz | |
[illumos-gate merge]
commit 5e74f94d8c2a16c2ef7cf2940a157ffabb379c27
3347 zonecfg(1M) is confused about selection
commit 5a81b4ad6a940aead6f0789e059a6f8fbc678be0
4544 sock2path(4) man page needs to be updated for configuration fragments
commit 2d08521bd15501c8370ba2153b9cca4f094979d0
2964 need POSIX 2008 locale object support
Conflicts:
usr/src/man/man3c/Makefile (copyright)
usr/src/lib/libzonecfg/common/libzonecfg.c (OS-216)
usr/src/lib/libc/sparcv9/Makefile.com (copyright)
usr/src/lib/libc/sparc/Makefile.com (copyright)
Manifests:
usr/src/pkg/manifests/system-header.mf
usr/src/pkg/manifests/system-library.man3c.inc
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); |