diff options
| author | loli10K <[email protected]> | 2018-03-18 09:34:45 +0100 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-05-01 10:33:35 -0700 |
| commit | 85ce3f4fd114cf3c7a77feb07b397d43b90d11c7 (patch) | |
| tree | 44e954831ea4375a3cabc1c4615ac3e6738d8a1e /lib/libzfs/libzfs_crypto.c | |
| parent | 6abf922574f39ad597ae122fa43d2fa811970720 (diff) | |
Adopt pyzfs from ClusterHQ
This commit introduces several changes:
* Update LICENSE and project information
* Give a good PEP8 talk to existing Python source code
* Add RPM/DEB packaging for pyzfs
* Fix some outstanding issues with the existing pyzfs code caused by
changes in the ABI since the last time the code was updated
* Integrate pyzfs Python unittest with the ZFS Test Suite
* Add missing libzfs_core functions: lzc_change_key,
lzc_channel_program, lzc_channel_program_nosync, lzc_load_key,
lzc_receive_one, lzc_receive_resumable, lzc_receive_with_cmdprops,
lzc_receive_with_header, lzc_reopen, lzc_send_resume, lzc_sync,
lzc_unload_key, lzc_remap
Note: this commit slightly changes zfs_ioc_unload_key() ABI. This allow
to differentiate the case where we tried to unload a key on a
non-existing dataset (ENOENT) from the situation where a dataset has
no key loaded: this is consistent with the "change" case where trying
to zfs_ioc_change_key() from a dataset with no key results in EACCES.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: loli10K <[email protected]>
Closes #7230
Diffstat (limited to 'lib/libzfs/libzfs_crypto.c')
| -rw-r--r-- | lib/libzfs/libzfs_crypto.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libzfs/libzfs_crypto.c b/lib/libzfs/libzfs_crypto.c index 9ad0fae7d..0956466e2 100644 --- a/lib/libzfs/libzfs_crypto.c +++ b/lib/libzfs/libzfs_crypto.c @@ -1185,7 +1185,7 @@ zfs_crypto_unload_key(zfs_handle_t *zhp) if (keystatus == ZFS_KEYSTATUS_UNAVAILABLE) { zfs_error_aux(zhp->zfs_hdl, dgettext(TEXT_DOMAIN, "Key already unloaded for '%s'."), zfs_get_name(zhp)); - ret = ENOENT; + ret = EACCES; goto error; } @@ -1198,7 +1198,7 @@ zfs_crypto_unload_key(zfs_handle_t *zhp) zfs_error_aux(zhp->zfs_hdl, dgettext(TEXT_DOMAIN, "Permission denied.")); break; - case ENOENT: + case EACCES: zfs_error_aux(zhp->zfs_hdl, dgettext(TEXT_DOMAIN, "Key already unloaded for '%s'."), zfs_get_name(zhp)); |