emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libbb: make xmalloc_sockaddr2dotted use NI_NUMERICSCOPE

Browse Source 
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>
This commit is contained in:
Denys Vlasenko 2016-09-26 19:53:04 +02:00
parent 525209ac94
commit 3c18e3051d
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libbb/xconnect.c
View File

@ -496,12 +496,15 @@ char* FAST_FUNC xmalloc_sockaddr2hostonly_noport(const struct sockaddr *sa)
{ {
return sockaddr2str(sa, NI_NAMEREQD | IGNORE_PORT); return sockaddr2str(sa, NI_NAMEREQD | IGNORE_PORT);
} }
#ifndef NI_NUMERICSCOPE
# define NI_NUMERICSCOPE 0
#endif
char* FAST_FUNC xmalloc_sockaddr2dotted(const struct sockaddr *sa) 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) 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);
} }

6
util-linux/mount.c
View File

@ -1975,6 +1975,12 @@ static int singlemount(struct mntent *mp, int ignore_busy)
dotted = xmalloc_sockaddr2dotted_noport(&lsa->u.sa); dotted = xmalloc_sockaddr2dotted_noport(&lsa->u.sa);
if (ENABLE_FEATURE_CLEAN_UP) free(lsa); if (ENABLE_FEATURE_CLEAN_UP) free(lsa);
ip = xasprintf("ip=%s", dotted); 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); if (ENABLE_FEATURE_CLEAN_UP) free(dotted);
parse_mount_options(ip, &filteropts); parse_mount_options(ip, &filteropts);
if (ENABLE_FEATURE_CLEAN_UP) free(ip); if (ENABLE_FEATURE_CLEAN_UP) free(ip);