From 5093c8c4aaf9666a4448aa3559fdf636d687ea49 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 26 Sep 2016 20:36:30 +0200 Subject: [PATCH] mount: tweak "IPv6 scoped addr" commit Signed-off-by: Denys Vlasenko --- util-linux/mount.c | 6 +++--- 1 file 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) 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 + if (ENABLE_FEATURE_CLEAN_UP) free(dotted); +// Note: IPv6 scoped addresses ("host%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); +// This probably should be fixed in glibc, not here. parse_mount_options(ip, &filteropts); if (ENABLE_FEATURE_CLEAN_UP) free(ip);