# HG changeset patch
# User George Wilson <George.Wilson@Sun.COM>
# Date 1280532110 25200
# Node ID caf415d9aa53a314c0eaec1f45969cd564049563
# Parent  d476be14f46facdec9034cf08059c76c20c65c4a
6973547 zpool import succeeds but prints error message

diff -r d476be14f46f -r caf415d9aa53 usr/src/lib/libzfs/common/libzfs_pool.c
--- a/usr/src/lib/libzfs/common/libzfs_pool.c	Fri Jul 30 15:51:47 2010 -0700
+++ b/usr/src/lib/libzfs/common/libzfs_pool.c	Fri Jul 30 16:21:50 2010 -0700
@@ -1453,7 +1453,7 @@
 		nvlist_free(props);
 		return (-1);
 	}
-	if (zcmd_alloc_dst_nvlist(hdl, &zc, 0) != 0) {
+	if (zcmd_alloc_dst_nvlist(hdl, &zc, zc.zc_nvlist_conf_size * 2) != 0) {
 		nvlist_free(props);
 		return (-1);
 	}
@@ -2905,7 +2905,7 @@
 	zpool_get_rewind_policy(rewindnvl, &policy);
 	zc.zc_cookie = policy.zrp_request;
 
-	if (zcmd_alloc_dst_nvlist(hdl, &zc, 0) != 0)
+	if (zcmd_alloc_dst_nvlist(hdl, &zc, zhp->zpool_config_size * 2) != 0)
 		return (-1);
 
 	if (zcmd_write_src_nvlist(zhp->zpool_hdl, &zc, rewindnvl) != 0)