diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-09-26 20:36:30 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-09-26 20:36:30 +0200 |
commit | 5093c8c4aaf9666a4448aa3559fdf636d687ea49 (patch) | |
tree | 8e364069937b2d8e0e7ce97cda77a6e7614dff78 | |
parent | 3c18e3051dfdb5591afc18562e9d9da987a5945e (diff) | |
download | busybox-w32-5093c8c4aaf9666a4448aa3559fdf636d687ea49.tar.gz busybox-w32-5093c8c4aaf9666a4448aa3559fdf636d687ea49.tar.bz2 busybox-w32-5093c8c4aaf9666a4448aa3559fdf636d687ea49.zip |
mount: tweak "IPv6 scoped addr" commit
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | util-linux/mount.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c index c3e91e2a6..305e41a3d 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c | |||
@@ -1975,13 +1975,13 @@ static int singlemount(struct mntent *mp, int ignore_busy) | |||
1975 | dotted = xmalloc_sockaddr2dotted_noport(&lsa->u.sa); | 1975 | dotted = xmalloc_sockaddr2dotted_noport(&lsa->u.sa); |
1976 | if (ENABLE_FEATURE_CLEAN_UP) free(lsa); | 1976 | if (ENABLE_FEATURE_CLEAN_UP) free(lsa); |
1977 | ip = xasprintf("ip=%s", dotted); | 1977 | ip = xasprintf("ip=%s", dotted); |
1978 | // Note: IPv6 scoped addresses ("name%iface", see RFC 4007) should be | 1978 | if (ENABLE_FEATURE_CLEAN_UP) free(dotted); |
1979 | // Note: IPv6 scoped addresses ("host%iface", see RFC 4007) should be | ||
1979 | // handled by libc in getnameinfo() (inside xmalloc_sockaddr2dotted_noport()). | 1980 | // handled by libc in getnameinfo() (inside xmalloc_sockaddr2dotted_noport()). |
1980 | // Currently, glibc does not support that (has no NI_NUMERICSCOPE), | 1981 | // Currently, glibc does not support that (has no NI_NUMERICSCOPE), |
1981 | // musl apparently does. This results in "ip=numericIPv6%iface_name" | 1982 | // musl apparently does. This results in "ip=numericIPv6%iface_name" |
1982 | // (instead of _numeric_ iface_id) with glibc. | 1983 | // (instead of _numeric_ iface_id) with glibc. |
1983 | // This probalby should be fixed in glibc, not here. | 1984 | // This probably should be fixed in glibc, not here. |
1984 | if (ENABLE_FEATURE_CLEAN_UP) free(dotted); | ||
1985 | parse_mount_options(ip, &filteropts); | 1985 | parse_mount_options(ip, &filteropts); |
1986 | if (ENABLE_FEATURE_CLEAN_UP) free(ip); | 1986 | if (ENABLE_FEATURE_CLEAN_UP) free(ip); |
1987 | 1987 | ||