libshare: nfs: correctly pass through ipv6 addresses in bracket notation

Closes: #11171, #1894
Signed-off-by: Felix Dörre <[email protected]>

Author: felixdoerre

lib/libshare/os/linux/nfs.c

@@ -136,7 +136,7 @@ foreach_nfs_host_cb(const char *opt, const char *value, void *pcookie)
 {
 	int error;
 	const char *access;
-	char *host_dup, *host, *next;
+	char *host_dup, *host, *next, *v6Literal;
 	nfs_host_cookie_t *udata = (nfs_host_cookie_t *)pcookie;
 
 #ifdef DEBUG
@@ -160,7 +160,37 @@ foreach_nfs_host_cb(const char *opt, const char *value, void *pcookie)
 		host = host_dup;
 
 		do {
-			next = strchr(host, ':');
+			if (*host == '[') {
+				host++;
+				v6Literal = strchr(host, ']');
+				if (v6Literal == NULL) {
+					free(host_dup);
+					return (SA_SYNTAX_ERR);
+				}
+				if (v6Literal[1] == '\0') {
+					*v6Literal = '\0';
+					next = NULL;
+				} else if (v6Literal[1] == '/') {
+					next = strchr(v6Literal + 2, ':');
+					if (next == NULL) {
+						memmove(v6Literal,
+							v6Literal + 1,
+							strlen(v6Literal + 1));
+					} else {
+						memmove(v6Literal,
+							v6Literal + 1,
+							next - v6Literal);
+					}
+				} else if (v6Literal[1] == ':') {
+					*v6Literal = '\0';
+					next = v6Literal + 2;
+				} else {
+					free(host_dup);
+					return (SA_SYNTAX_ERR);
+				}
+			} else {
+				next = strchr(host, ':');
+			}
 			if (next != NULL) {
 				*next = '\0';
 				next++;

man/man8/zfs.8

@@ -549,7 +549,7 @@ on the
 .Em tank/home
 file system.
 .Bd -literal
-# zfs set sharenfs='[email protected]/16,root=neo' tank/home
+# zfs set sharenfs='[email protected]/16:[::1],root=neo' tank/home
 .Ed
 .Pp
 If you are using

tests/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_005_pos.ksh

@@ -52,7 +52,7 @@ function cleanup
 
 if is_linux; then
 	set -A shareopts \
-	    "ro" "rw" "rw,insecure" "rw,async" "ro,crossmnt"
+	    "ro" "rw" "rw,insecure" "rw,async" "ro,crossmnt" "rw=[::1]"
 else
 	set -A shareopts \
 	    "ro" "ro=machine1" "ro=machine1:machine2" \

tests/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_007_neg.ksh

@@ -51,7 +51,7 @@ function cleanup {
 
 set -A badopts \
     "r0" "r0=machine1" "r0=machine1:machine2" \
-    "-g" "-b" "-c" "-d" "--invalid" \
+    "-g" "-b" "-c" "-d" "--invalid" "rw=[::1]a:[::2]" "rw=[::1" \
     "$TESTPOOL" "$TESTPOOL/$TESTFS" "$TESTPOOL\$TESTCTR\$TESTFS1"
 
 log_assert "Verify that invalid share parameters and options are caught."