Author: kevans
Date: Thu Apr 25 15:51:09 2019
New Revision: 346680
URL: https://svnweb.freebsd.org/changeset/base/346680
Log:
libbe(3): Copy received properties as well
This was inherently broken on send|recv datasets.
Reported and tested by: Wes Maag <jwmaag gmail com>
MFC after: 3 days
Modified:
head/lib/libbe/be.c
Modified: head/lib/libbe/be.c
==============================================================================
--- head/lib/libbe/be.c Thu Apr 25 15:51:00 2019 (r346679)
+++ head/lib/libbe/be.c Thu Apr 25 15:51:09 2019 (r346680)
@@ -431,8 +431,12 @@ be_deep_clone_prop(int prop, void *cb)
/* Just continue if we fail to read a property */
return (ZPROP_CONT);
- /* Only copy locally defined properties */
- if (src != ZPROP_SRC_LOCAL)
+ /*
+ * Only copy locally defined or received properties. This continues
+ * to avoid temporary/default/local properties intentionally without
+ * breaking received datasets.
+ */
+ if (src != ZPROP_SRC_LOCAL && src != ZPROP_SRC_RECEIVED)
return (ZPROP_CONT);
/* Augment mountpoint with altroot, if needed */
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
