]> granicus.if.org Git - zfs/commit
Fix incremental recursive encrypted receive
authorTom Caputi <tcaputi@datto.com>
Thu, 24 Oct 2019 17:51:01 +0000 (13:51 -0400)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 24 Oct 2019 17:51:01 +0000 (10:51 -0700)
commitb4238327b4ec84451fd2944cee7ccff37a065d27
treebf980591b57ab87f778f47225df04faa4331a93f
parent28f7427ab163887e901708dec5e7e72a6ac2a269
Fix incremental recursive encrypted receive

Currently, incremental recursive encrypted receives fail to work
for any snapshot after the first. The reason for this is because
the check in zfs_setup_cmdline_props() did not properly realize
that when the user attempts to use '-x encryption' in this
situation, they are not really overriding the existing encryption
property and instead are attempting to prevent it from changing.
This resulted in an error message stating: "encryption property
'encryption' cannot be set or excluded for raw or incremental
streams".

This problem is fixed by updating the logic to expect this use
case.

Reviewed-by: loli10K <ezomori.nozomu@gmail.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Igor Kozhukhov <igor@dilos.org>
Signed-off-by: Tom Caputi <tcaputi@datto.com>
Closes #9494
lib/libzfs/libzfs_sendrecv.c
tests/zfs-tests/tests/functional/rsend/send_encrypted_props.ksh