From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 28 May 2010 20:54:49 +0000 (-0700)
Subject: Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
X-Git-Tag: zfs-0.5.0~38^2^2~1^2^2~34^2^2^2~3^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c1f1ca76b78329a72b5086fd9040522a0face8f;p=zfs

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

Conflicts:
	lib/libzfs/libzfs_sendrecv.c
---

6c1f1ca76b78329a72b5086fd9040522a0face8f
diff --cc lib/libzfs/libzfs_sendrecv.c
index 97dff40d2,672e004ef..c7177eb23
--- a/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));