diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-06-22 12:08:08 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-06-22 12:08:08 +0000 |
| commit | c94ca3d49b9a7d5d1c8f4ec4898f969d57366fae (patch) | |
| tree | 1c3f449cf82fbd1e8b4bc4aaa8a4602a72538066 /usr/src/lib/libipadm | |
| parent | 3d094ef1183b3f309a9d1ce850dec289df28c532 (diff) | |
| parent | a40ea1a7d80eee1b409e9dcc2e48c730988147ea (diff) | |
| download | illumos-joyent-c94ca3d49b9a7d5d1c8f4ec4898f969d57366fae.tar.gz | |
[illumos-gate merge]
commit a40ea1a7d80eee1b409e9dcc2e48c730988147ea
8297 update mdocml to 1.14.1
commit 299c9e70a71f87365f8f88fdea2cccbd0d5b8db6
8082 last(1) should be able to print years in output
commit d21cedec4ed074c3a6feb4a8a007a9cb83cca060
8323 ndmpd: left shift of the negative value
commit 78916deaa2ec29fc04f5a0cddacf4bd749a2188f
8415 loader: biosdisk comment wording
commit 422eb17feeb8fadbfa2a80faf5c8a8d2987f9196
8374 loader: devicename.c cleanup
commit e2fc3408efa6cdfc5e33c73c3567efc8c7592707
8376 cached v_path should be kept fresh
commit e34d8872f4a713d904a4b34fb081060d1a7eba62
3729 getifaddrs must learn to stop worrying and love the other address families
commit 0bb3cf0bf38ac0d43c9c480709323240b002c1dd
8335 mr_sas - remove PDSUPPORT conditional.
commit 567fb7ba1e336fc2eab74e747be1e7ac51f1a4ee
8396 uts: vm_dep.h error: left shift of negative value
commit 02553f55739fa960255c83b5c09351e2fa244ba2
8336 ed: misleading-indentation
Conflicts:
usr/src/uts/common/fs/vnode.c
usr/src/uts/common/fs/lookup.c
usr/src/tools/mandoc/Makefile
Diffstat (limited to 'usr/src/lib/libipadm')
| -rw-r--r-- | usr/src/lib/libipadm/common/ipadm_addr.c | 3 | ||||
| -rw-r--r-- | usr/src/lib/libipadm/common/ipadm_if.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/usr/src/lib/libipadm/common/ipadm_addr.c b/usr/src/lib/libipadm/common/ipadm_addr.c index a62bcb165b..31f6f9cfc5 100644 --- a/usr/src/lib/libipadm/common/ipadm_addr.c +++ b/usr/src/lib/libipadm/common/ipadm_addr.c @@ -375,6 +375,9 @@ retry: for (ifap = ifa; ifap != NULL; ifap = ifap->ifa_next) { struct sockaddr_storage data; + if (ifap->ifa_addr->sa_family == AF_LINK) + continue; + (void) strlcpy(cifname, ifap->ifa_name, sizeof (cifname)); lnum = 0; if ((sep = strrchr(cifname, ':')) != NULL) { diff --git a/usr/src/lib/libipadm/common/ipadm_if.c b/usr/src/lib/libipadm/common/ipadm_if.c index 41f22e4eeb..c58eb6248e 100644 --- a/usr/src/lib/libipadm/common/ipadm_if.c +++ b/usr/src/lib/libipadm/common/ipadm_if.c @@ -276,6 +276,8 @@ retry: * to find the interface state. */ for (ifap = ifa; ifap != NULL; ifap = ifap->ifa_next) { + if (ifap->ifa_addr->sa_family == AF_LINK) + continue; if (strcmp(ifap->ifa_name, aifp->ifi_name) == 0) break; } |