Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl

This commit is contained in:
Brian Behlendorf 2009-03-12 15:29:20 -07:00
commit 85abe1f810
1 changed files with 1 additions and 1 deletions

View File

@ -1642,7 +1642,7 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap,
* Determine name of destination snapshot, store in zc_value. * Determine name of destination snapshot, store in zc_value.
*/ */
(void) strcpy(zc.zc_value, tosnap); (void) strcpy(zc.zc_value, tosnap);
(void) strncat(zc.zc_value, drrb->drr_toname+choplen, (void) strlcat(zc.zc_value, drrb->drr_toname+choplen,
sizeof (zc.zc_value)); sizeof (zc.zc_value));
if (!zfs_name_valid(zc.zc_value, ZFS_TYPE_SNAPSHOT)) { if (!zfs_name_valid(zc.zc_value, ZFS_TYPE_SNAPSHOT)) {
zcmd_free_nvlists(&zc); zcmd_free_nvlists(&zc);