diff options
| author | Denys Vlasenko | 2016-09-26 19:53:04 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2016-09-26 19:53:04 +0200 |
| commit | 3c18e3051dfdb5591afc18562e9d9da987a5945e (patch) | |
| tree | f3d6a693bb0f8cb4dea6e1a3a8632698279d63d6 | |
| parent | 525209ac9465f37a9ba292f1ff138dd80768e869 (diff) | |
| download | busybox-3c18e3051dfdb5591afc18562e9d9da987a5945e.zip busybox-3c18e3051dfdb5591afc18562e9d9da987a5945e.tar.gz | |
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>
| -rw-r--r-- | libbb/xconnect.c | 7 | ||||
| -rw-r--r-- | util-linux/mount.c | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/libbb/xconnect.c b/libbb/xconnect.c index 6e78e63..3a0dc26 100644 --- a/libbb/xconnect.c +++ b/libbb/xconnect.c @@ -496,12 +496,15 @@ char* FAST_FUNC xmalloc_sockaddr2hostonly_noport(const struct sockaddr *sa) { return sockaddr2str(sa, NI_NAMEREQD | IGNORE_PORT); } +#ifndef NI_NUMERICSCOPE +# define NI_NUMERICSCOPE 0 +#endif char* FAST_FUNC xmalloc_sockaddr2dotted(const struct sockaddr *sa) { - return sockaddr2str(sa, NI_NUMERICHOST); + return sockaddr2str(sa, NI_NUMERICHOST | NI_NUMERICSCOPE); } char* FAST_FUNC xmalloc_sockaddr2dotted_noport(const struct sockaddr *sa) { - return sockaddr2str(sa, NI_NUMERICHOST | IGNORE_PORT); + return sockaddr2str(sa, NI_NUMERICHOST | NI_NUMERICSCOPE | IGNORE_PORT); } diff --git a/util-linux/mount.c b/util-linux/mount.c index 13590ce..c3e91e2 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c @@ -1975,6 +1975,12 @@ static int singlemount(struct mntent *mp, int ignore_busy) dotted = xmalloc_sockaddr2dotted_noport(&lsa->u.sa); if (ENABLE_FEATURE_CLEAN_UP) free(lsa); ip = xasprintf("ip=%s", dotted); +// Note: IPv6 scoped addresses ("name%iface", see RFC 4007) should be +// handled by libc in getnameinfo() (inside xmalloc_sockaddr2dotted_noport()). +// Currently, glibc does not support that (has no NI_NUMERICSCOPE), +// musl apparently does. This results in "ip=numericIPv6%iface_name" +// (instead of _numeric_ iface_id) with glibc. +// This probalby should be fixed in glibc, not here. if (ENABLE_FEATURE_CLEAN_UP) free(dotted); parse_mount_options(ip, &filteropts); if (ENABLE_FEATURE_CLEAN_UP) free(ip); |