Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile
===================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile	(revision 323937)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile	(revision 323938)
@@ -1,39 +1,40 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 PACKAGE=tests
 TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_import
 FILESDIR=${TESTSDIR}
 
 ATF_TESTS_KSH93+=	zpool_import_test
 
 ${PACKAGE}FILES+=	zpool_import_006_pos.ksh
 ${PACKAGE}FILES+=	zpool_import_002_pos.ksh
 ${PACKAGE}FILES+=	zpool_import_missing_003_pos.ksh
 ${PACKAGE}FILES+=	zpool_import_all_001_pos.ksh
 ${PACKAGE}FILES+=	zpool_import.cfg
 ${PACKAGE}FILES+=	zpool_import_corrupt_001_pos.ksh
+${PACKAGE}FILES+=	zpool_import_destroyed_001_neg.ksh
 ${PACKAGE}FILES+=	zpool_import_012_pos.ksh
 ${PACKAGE}FILES+=	zpool_import_013_neg.ksh
 ${PACKAGE}FILES+=	zpool_import_007_pos.ksh
 ${PACKAGE}FILES+=	zpool_import_003_pos.ksh
 ${PACKAGE}FILES+=	zpool_import_rename_001_pos.ksh
 ${PACKAGE}FILES+=	zpool_import_missing_002_pos.ksh
 ${PACKAGE}FILES+=	setup.ksh
 ${PACKAGE}FILES+=	zpool_import_010_pos.ksh
 ${PACKAGE}FILES+=	zpool_import_014_pos.ksh
 ${PACKAGE}FILES+=	cleanup.ksh
 ${PACKAGE}FILES+=	zpool_import_011_neg.ksh
 ${PACKAGE}FILES+=	zpool_import_missing_004_pos.ksh
 ${PACKAGE}FILES+=	zpool_import_missing_005_pos.ksh
 ${PACKAGE}FILES+=	zpool_import_005_pos.ksh
 ${PACKAGE}FILES+=	zpool_import_009_neg.ksh
 ${PACKAGE}FILES+=	zpool_import_missing_001_pos.ksh
 ${PACKAGE}FILES+=	zpool_import_008_pos.ksh
 ${PACKAGE}FILES+=	zpool_import_004_pos.ksh
 ${PACKAGE}FILES+=	zpool_import.kshlib
 
 SUBDIR+=	blockfiles
 
 .include <bsd.test.mk>
Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_destroyed_001_neg.ksh
===================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_destroyed_001_neg.ksh	(nonexistent)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_destroyed_001_neg.ksh	(revision 323938)
@@ -0,0 +1,66 @@
+#!/usr/local/bin/ksh93
+#
+# Copyright (c) 2017 Spectra Logic Corporation
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions, and the following disclaimer,
+#    without modification.
+# 2. Redistributions in binary form must reproduce at minimum a disclaimer       
+#    substantially similar to the "NO WARRANTY" disclaimer below
+#    ("Disclaimer") and any redistribution must be conditioned upon
+#    including a substantially similar Disclaimer requirement for further
+#    binary redistribution.
+#
+# NO WARRANTY
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL     
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGES.
+#
+# $FreeBSD$
+
+. $STF_SUITE/include/libtest.kshlib
+set_disks
+
+# A destroyed pool cannot be imported, even if an out-of-date non-destroyed
+# label is present
+#
+# This situation arose when a user activated a spare, removed the spare disk,
+# destroyed the pool, reinserted the spare disk, and then tried to import the
+# pool.  Since the pool was destroyed, nothing should've happened.  But the
+# spare disk had a non-destroyed label, so zpool tried to import it.  A panic
+# ensued.
+#
+# More generally, this situation can happen any time the following things happen:
+# 1) A disk gets removed with its label intact
+# 2) The pool's configuration changes
+# 3) The pool gets destroyed
+# 4) Somebody tries to import the pool
+
+log_must $ZPOOL create -f $TESTPOOL mirror ${DISK0} ${DISK1}
+
+# Offline a disk so it's label won't get updated by the upcoming destroy
+log_must $ZPOOL offline $TESTPOOL ${DISK0}
+
+# Now change the pool's configuration, so DISK0's label will be out-of-date
+log_must $ZPOOL attach $TESTPOOL ${DISK1} ${DISK2}
+
+# Destroy the pool, so DISK1's and DISK2's labels will be in the destroyed
+# state, leaving DISK0's label as the most recent non-destroyed label
+log_must $ZPOOL destroy $TESTPOOL
+
+# Now try to import the pool.  It should fail.
+log_mustnot $ZPOOL import $TESTPOOL
+
+log_pass
Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_test.sh
===================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_test.sh	(revision 323937)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_test.sh	(revision 323938)
@@ -1,543 +1,564 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
 #
 # Copyright 2012 Spectra Logic.  All rights reserved.
 # Use is subject to license terms.
 #
 
 
 atf_test_case zpool_import_002_pos cleanup
 zpool_import_002_pos_head()
 {
 	atf_set "descr" "Verify that an exported pool can be imported and cannot be imported more than once."
 	atf_set "require.progs"  zfs zpool sum zdb
 	atf_set "timeout" 2400
 }
 zpool_import_002_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	verify_disk_count "$DISKS" 2
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_import_002_pos.ksh || atf_fail "Testcase failed"
 }
 zpool_import_002_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_import_003_pos cleanup
 zpool_import_003_pos_head()
 {
 	atf_set "descr" "Destroyed pools are not listed unless with -D option is specified."
 	atf_set "require.progs"  zpool zfs
 	atf_set "timeout" 2400
 }
 zpool_import_003_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	verify_disk_count "$DISKS" 2
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_import_003_pos.ksh || atf_fail "Testcase failed"
 }
 zpool_import_003_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_import_004_pos cleanup
 zpool_import_004_pos_head()
 {
 	atf_set "descr" "Destroyed pools devices was moved to another directory,it still can be imported correctly."
 	atf_set "require.progs"  zpool zfs zdb
 	atf_set "timeout" 2400
 }
 zpool_import_004_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	verify_disk_count "$DISKS" 2
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_import_004_pos.ksh || atf_fail "Testcase failed"
 }
 zpool_import_004_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_import_005_pos cleanup
 zpool_import_005_pos_head()
 {
 	atf_set "descr" "Destroyed pools devices was renamed, it still can be importedcorrectly."
 	atf_set "require.progs"  zpool zfs zdb
 	atf_set "timeout" 2400
 }
 zpool_import_005_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	verify_disk_count "$DISKS" 2
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_import_005_pos.ksh || atf_fail "Testcase failed"
 }
 zpool_import_005_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_import_006_pos cleanup
 zpool_import_006_pos_head()
 {
 	atf_set "descr" "For mirror, N-1 destroyed pools devices was removed or usedby other pool, it still can be imported correctly."
 	atf_set "require.progs"  zpool zfs zdb
 	atf_set "timeout" 2400
 }
 zpool_import_006_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	verify_disk_count "$DISKS" 2
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_import_006_pos.ksh || atf_fail "Testcase failed"
 }
 zpool_import_006_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_import_007_pos cleanup
 zpool_import_007_pos_head()
 {
 	atf_set "descr" "For raidz, one destroyed pools devices was removed or used byother pool, it still can be imported correctly."
 	atf_set "require.progs"  zpool zfs zdb
 	atf_set "timeout" 2400
 }
 zpool_import_007_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	verify_disk_count "$DISKS" 2
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_import_007_pos.ksh || atf_fail "Testcase failed"
 }
 zpool_import_007_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_import_008_pos cleanup
 zpool_import_008_pos_head()
 {
 	atf_set "descr" "For raidz2, two destroyed pools devices was removed or used byother pool, it still can be imported correctly."
 	atf_set "require.progs"  zpool zfs zdb
 	atf_set "timeout" 2400
 }
 zpool_import_008_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	verify_disk_count "$DISKS" 2
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_import_008_pos.ksh || atf_fail "Testcase failed"
 }
 zpool_import_008_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_import_009_neg cleanup
 zpool_import_009_neg_head()
 {
 	atf_set "descr" "Badly-formed 'zpool import' with inapplicable scenariosshould return an error."
 	atf_set "require.progs"  zfs zpool
 	atf_set "timeout" 2400
 }
 zpool_import_009_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	verify_disk_count "$DISKS" 2
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_import_009_neg.ksh || atf_fail "Testcase failed"
 }
 zpool_import_009_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_import_010_pos cleanup
 zpool_import_010_pos_head()
 {
 	atf_set "descr" "'zpool -D -a' can import all the specified directoriesdestroyed pools."
 	atf_set "require.progs"  zpool zfs
 	atf_set "timeout" 2400
 }
 zpool_import_010_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	verify_disk_count "$DISKS" 2
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_import_010_pos.ksh || atf_fail "Testcase failed"
 }
 zpool_import_010_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_import_011_neg cleanup
 zpool_import_011_neg_head()
 {
 	atf_set "descr" "For strip pool, any destroyed pool devices was demaged,zpool import -D will failed."
 	atf_set "require.progs"  zpool zfs zdb
 	atf_set "timeout" 2400
 }
 zpool_import_011_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	verify_disk_count "$DISKS" 2
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_import_011_neg.ksh || atf_fail "Testcase failed"
 }
 zpool_import_011_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_import_012_pos cleanup
 zpool_import_012_pos_head()
 {
 	atf_set "descr" "Verify all mount & share status of sub-filesystems within a poolcan be restored after import [-Df]."
 	atf_set "require.progs"  zfs zpool zdb share
 	atf_set "timeout" 2400
 }
 zpool_import_012_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	verify_disk_count "$DISKS" 2
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_import_012_pos.ksh || atf_fail "Testcase failed"
 }
 zpool_import_012_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_import_013_neg
 zpool_import_013_neg_head()
 {
 	atf_set "descr" "'zpool import' fails for pool that was not cleanly exported"
 	atf_set "require.progs"  zfs zpool
 }
 zpool_import_013_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	ksh93 $(atf_get_srcdir)/zpool_import_013_neg.ksh || atf_fail "Testcase failed"
 }
 
 
 atf_test_case zpool_import_014_pos cleanup
 zpool_import_014_pos_head()
 {
 	atf_set "descr" "'zpool import' can import destroyed disk-backed pools"
 	atf_set "require.progs"  zfs zpool
 }
 zpool_import_014_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	verify_disk_count "$DISKS" 1
 	ksh93 $(atf_get_srcdir)/zpool_import_014_pos.ksh || atf_fail "Testcase failed"
 }
 zpool_import_014_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_import_all_001_pos cleanup
 zpool_import_all_001_pos_head()
 {
 	atf_set "descr" "Verify that 'zpool import -a' succeeds as root."
 	atf_set "require.progs"  zfs zpool sum
 	atf_set "timeout" 2400
 }
 zpool_import_all_001_pos_body()
 {
 	atf_skip "This test relies heavily on Solaris slices.  It could be ported, but that is difficult due to the high degree of obfuscation in the code"
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	verify_disk_count "$DISKS" 2
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_import_all_001_pos.ksh || atf_fail "Testcase failed"
 }
 zpool_import_all_001_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_import_missing_001_pos cleanup
 zpool_import_missing_001_pos_head()
 {
 	atf_set "descr" "Verify that import could handle damaged or missing device."
 	atf_set "require.progs"  zfs sum zpool zdb
 	atf_set "timeout" 2400
 }
 zpool_import_missing_001_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	verify_disk_count "$DISKS" 2
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_import_missing_001_pos.ksh || atf_fail "Testcase failed"
 }
 zpool_import_missing_001_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_import_missing_002_pos cleanup
 zpool_import_missing_002_pos_head()
 {
 	atf_set "descr" "Verify that import could handle moving device."
 	atf_set "require.progs"  zpool zfs zdb
 	atf_set "timeout" 2400
 }
 zpool_import_missing_002_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	verify_disk_count "$DISKS" 2
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_import_missing_002_pos.ksh || atf_fail "Testcase failed"
 }
 zpool_import_missing_002_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_import_missing_003_pos cleanup
 zpool_import_missing_003_pos_head()
 {
 	atf_set "descr" "Verify that import could handle device overlapped."
 	atf_set "require.progs"  zpool sum zfs
 	atf_set "timeout" 2400
 }
 zpool_import_missing_003_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	verify_disk_count "$DISKS" 2
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_import_missing_003_pos.ksh || atf_fail "Testcase failed"
 }
 zpool_import_missing_003_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 atf_test_case zpool_import_missing_004_pos
 zpool_import_missing_004_pos_head()
 {
 	atf_set "descr" "Verify that zpool import succeeds when devices are missing"
 	atf_set "require.progs"  zfs zpool
 	atf_set "timeout" 300
 }
 zpool_import_missing_004_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	ksh93 $(atf_get_srcdir)/zpool_import_missing_004_pos.ksh || atf_fail "Testcase failed"
 }
 
 atf_test_case zpool_import_missing_005_pos
 zpool_import_missing_005_pos_head()
 {
 	atf_set "descr" "Verify that zpool import succeeds when devices of all types have been renamed"
 	atf_set "require.progs"  mdconfig zfs zpool
 	atf_set "timeout" 300
 }
 zpool_import_missing_005_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	ksh93 $(atf_get_srcdir)/zpool_import_missing_005_pos.ksh || atf_fail "Testcase failed"
 }
 
 
 atf_test_case zpool_import_rename_001_pos cleanup
 zpool_import_rename_001_pos_head()
 {
 	atf_set "descr" "Verify that an imported pool can be renamed."
 	atf_set "require.progs"  zfs zpool sum zdb
 	atf_set "timeout" 2400
 }
 zpool_import_rename_001_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	verify_disk_count "$DISKS" 2
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_import_rename_001_pos.ksh || atf_fail "Testcase failed"
 }
 zpool_import_rename_001_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 atf_test_case zpool_import_corrupt_001_pos cleanup
 zpool_import_corrupt_001_pos_head()
 {
 	atf_set "descr" "Verify that a disk-backed exported pool with some of its vdev labels corrupted can still be imported"
 	atf_set "require.progs"  zfs zpool zdb
 	atf_set "timeout" 2400
 }
 zpool_import_corrupt_001_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	verify_disk_count "$DISKS" 1
 	ksh93 $(atf_get_srcdir)/zpool_import_corrupt_001_pos.ksh || atf_fail "Testcase failed"
 }
 zpool_import_corrupt_001_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_import.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
+atf_test_case zpool_import_destroyed_001_neg cleanup
+zpool_import_destroyed_001_neg_head()
+{
+	atf_set "descr" "A destroyed pool cannot be imported even if an out-of-date non-destroyed label remains"
+	atf_set "require.progs"  zfs zpool
+}
+zpool_import_destroyed_001_neg_body()
+{
+	. $(atf_get_srcdir)/../../../include/default.cfg
 
+	verify_disk_count "$DISKS" 3
+	ksh93 $(atf_get_srcdir)/zpool_import_destroyed_001_neg.ksh || atf_fail "Testcase failed"
+}
+zpool_import_destroyed_001_neg_cleanup()
+{
+	. $(atf_get_srcdir)/../../../include/default.cfg
+
+	cleanup_devices "$DISKS"
+}
+
+
 atf_init_test_cases()
 {
 
 	atf_add_test_case zpool_import_002_pos
 	atf_add_test_case zpool_import_003_pos
 	atf_add_test_case zpool_import_004_pos
 	atf_add_test_case zpool_import_005_pos
 	atf_add_test_case zpool_import_006_pos
 	atf_add_test_case zpool_import_007_pos
 	atf_add_test_case zpool_import_008_pos
 	atf_add_test_case zpool_import_009_neg
 	atf_add_test_case zpool_import_010_pos
 	atf_add_test_case zpool_import_011_neg
 	atf_add_test_case zpool_import_012_pos
 	atf_add_test_case zpool_import_013_neg
 	atf_add_test_case zpool_import_014_pos
 	atf_add_test_case zpool_import_all_001_pos
 	atf_add_test_case zpool_import_missing_001_pos
 	atf_add_test_case zpool_import_missing_002_pos
 	atf_add_test_case zpool_import_missing_003_pos
 	atf_add_test_case zpool_import_missing_004_pos
 	atf_add_test_case zpool_import_missing_005_pos
 	atf_add_test_case zpool_import_rename_001_pos
 	atf_add_test_case zpool_import_corrupt_001_pos
+	atf_add_test_case zpool_import_destroyed_001_neg
 }