Author: tsoome
Date: Wed Aug 5 14:08:44 2020
New Revision: 363910
URL: https://svnweb.freebsd.org/changeset/base/363910
Log:
zfs_keys_nextboot array is missing ZPOOL_CONFIG_POOL_GUID and
ZPOOL_CONFIG_GUID
As we do check the incomint nvlist, we either need to list all possible
keys or use wildcard.
PR: 248462
Reported by: larafer...@gmail.com
Sponsored by: Netflix, Klara Inc.
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Wed Aug
5 11:54:51 2020 (r363909)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Wed Aug
5 14:08:44 2020 (r363910)
@@ -3656,7 +3656,9 @@ zfs_ioc_log_history(const char *unused, nvlist_t *innv
#ifdef __FreeBSD__
static const zfs_ioc_key_t zfs_keys_nextboot[] = {
- {"command", DATA_TYPE_STRING, 0},
+ {"command", DATA_TYPE_STRING, 0},
+ {ZPOOL_CONFIG_POOL_GUID, DATA_TYPE_UINT64, 0},
+ {ZPOOL_CONFIG_GUID, DATA_TYPE_UINT64, 0}
};
static int
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
