Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

libzfs: sendrecv: fix missing error output for invalid properties 

Fixes: 7633c0aedd ("libzfs: sendrecv:
fix unused, remove argsused")

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Amanakis <gamanakis@gmail.com>
Reviewed-by: Ryan Moeller <freqlabs@FreeBSD.org>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13100
Closes #13101
This commit is contained in:
наб 2022-02-14 14:29:27 +01:00 committed by Brian Behlendorf
parent 0c8aab9586
commit ae07fc1393
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/libzfs/libzfs_sendrecv.c
View File

@ -5023,11 +5023,10 @@ static boolean_t
zfs_receive_checkprops(libzfs_handle_t *hdl, nvlist_t *props, zfs_receive_checkprops(libzfs_handle_t *hdl, nvlist_t *props,
const char *errbuf) const char *errbuf)
{ {
nvpair_t *nvp; nvpair_t *nvp = NULL;
zfs_prop_t prop; zfs_prop_t prop;
const char *name; const char *name;
nvp = NULL;
while ((nvp = nvlist_next_nvpair(props, nvp)) != NULL) { while ((nvp = nvlist_next_nvpair(props, nvp)) != NULL) {
name = nvpair_name(nvp); name = nvpair_name(nvp);
prop = zfs_name_to_prop(name); prop = zfs_name_to_prop(name);
@ -5086,7 +5085,7 @@ zfs_receive_impl(libzfs_handle_t *hdl, const char *tosnap,
/* check cmdline props, raise an error if they cannot be received */ /* check cmdline props, raise an error if they cannot be received */
if (!zfs_receive_checkprops(hdl, cmdprops, errbuf)) if (!zfs_receive_checkprops(hdl, cmdprops, errbuf))
return (-1); return (zfs_error(hdl, EZFS_BADPROP, errbuf));
if (flags->isprefix && if (flags->isprefix &&
!zfs_dataset_exists(hdl, tosnap, ZFS_TYPE_DATASET)) { !zfs_dataset_exists(hdl, tosnap, ZFS_TYPE_DATASET)) {