diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-09-26 19:53:04 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-09-26 19:53:04 +0200 |
commit | 3c18e3051dfdb5591afc18562e9d9da987a5945e (patch) | |
tree | f3d6a693bb0f8cb4dea6e1a3a8632698279d63d6 /util-linux | |
parent | 525209ac9465f37a9ba292f1ff138dd80768e869 (diff) | |
download | busybox-w32-3c18e3051dfdb5591afc18562e9d9da987a5945e.tar.gz busybox-w32-3c18e3051dfdb5591afc18562e9d9da987a5945e.tar.bz2 busybox-w32-3c18e3051dfdb5591afc18562e9d9da987a5945e.zip |
libbb: make xmalloc_sockaddr2dotted use NI_NUMERICSCOPE
Gives "mount -t cifs //fe80::6a05:caff:fe3e:dbf5%eth0/test test"
a chance to work: mount must pass "ip=numeric_IPv6%numeric_iface_id"
in the omunt option string. Currently, it does not.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux')
-rw-r--r-- | util-linux/mount.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c index 13590ceb4..c3e91e2a6 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c | |||
@@ -1975,6 +1975,12 @@ 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 | ||
1979 | // handled by libc in getnameinfo() (inside xmalloc_sockaddr2dotted_noport()). | ||
1980 | // Currently, glibc does not support that (has no NI_NUMERICSCOPE), | ||
1981 | // musl apparently does. This results in "ip=numericIPv6%iface_name" | ||
1982 | // (instead of _numeric_ iface_id) with glibc. | ||
1983 | // This probalby should be fixed in glibc, not here. | ||
1978 | if (ENABLE_FEATURE_CLEAN_UP) free(dotted); | 1984 | if (ENABLE_FEATURE_CLEAN_UP) free(dotted); |
1979 | parse_mount_options(ip, &filteropts); | 1985 | parse_mount_options(ip, &filteropts); |
1980 | if (ENABLE_FEATURE_CLEAN_UP) free(ip); | 1986 | if (ENABLE_FEATURE_CLEAN_UP) free(ip); |