From 3c18e3051dfdb5591afc18562e9d9da987a5945e Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 26 Sep 2016 19:53:04 +0200 Subject: 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 --- libbb/xconnect.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'libbb') diff --git a/libbb/xconnect.c b/libbb/xconnect.c index 6e78e6363..3a0dc2653 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); } -- cgit v1.2.3