Merge commit 'refs/top-bases/fix-strncat' into fix-strncat

Conflicts:
	lib/libzfs/libzfs_sendrecv.c

diff --cc lib/libzfs/libzfs_sendrecv.c
index 97dff40d2886473b7c03d0571bbfb9649ed48963,672e004ef5cd9086e76d8d6b64c4d5cc45eabd68..c7177eb23eaded72b4b456204ac600eb30ccc9f4
--- 1/lib/libzfs/libzfs_sendrecv.c
--- 2/lib/libzfs/libzfs_sendrecv.c
+++ b/lib/libzfs/libzfs_sendrecv.c
@@@ -1682,9 -2414,10 +2414,10 @@@ zfs_receive_one(libzfs_handle_t *hdl, i
        /*
         * Determine name of destination snapshot, store in zc_value.
         */
+       (void) strcpy(zc.zc_top_ds, tosnap);
        (void) strcpy(zc.zc_value, tosnap);
-       (void) strlcat(zc.zc_value, drrb->drr_toname+choplen,
-           sizeof (zc.zc_value));
 -      (void) strncat(zc.zc_value, chopprefix, sizeof (zc.zc_value));
++      (void) strlcat(zc.zc_value, chopprefix, sizeof (zc.zc_value));
+       free(cp);
        if (!zfs_name_valid(zc.zc_value, ZFS_TYPE_SNAPSHOT)) {
                zcmd_free_nvlists(&zc);
                return (zfs_error(hdl, EZFS_INVALIDNAME, errbuf));