diff options
| author | LOLi <[email protected]> | 2016-10-07 19:05:06 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-10-07 10:05:06 -0700 |
| commit | 48f783de792727c26f43983155bac057c296e44d (patch) | |
| tree | c8479202b4bf33bfb5858d5412f72ebef6eb2d5f /lib/libzfs | |
| parent | 910a571578b0627bf9a1f2a99d89260132f3cba8 (diff) | |
Fix uninitialized variable snapprops_nvlist in zfs_receive_one
The variable snapprops_nvlist was never initialized, so properties
were not applied to the received snapshot.
Additionally, add zfs_receive_013_pos.ksh script to ZFS test suite to exercise
'zfs receive' functionality for user properties.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: loli10K <[email protected]>
Closes #4338
Diffstat (limited to 'lib/libzfs')
| -rw-r--r-- | lib/libzfs/libzfs_sendrecv.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/libzfs/libzfs_sendrecv.c b/lib/libzfs/libzfs_sendrecv.c index f70e34107..ff84a1acd 100644 --- a/lib/libzfs/libzfs_sendrecv.c +++ b/lib/libzfs/libzfs_sendrecv.c @@ -3110,6 +3110,7 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap, ENOENT); if (stream_avl != NULL) { + nvlist_t *lookup = NULL; nvlist_t *fs = fsavl_find(stream_avl, drrb->drr_toguid, &snapname); @@ -3125,6 +3126,10 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap, VERIFY(0 == nvlist_add_uint64(props, zfs_prop_to_name(ZFS_PROP_CANMOUNT), 0)); } + if (0 == nvlist_lookup_nvlist(fs, "snapprops", &lookup)) { + VERIFY(0 == nvlist_lookup_nvlist(lookup, + snapname, &snapprops_nvlist)); + } } cp = NULL; |