Rebase master to b117

[mirror_zfs-debian.git] / lib / libzfs / libzfs_sendrecv.c

diff --git a/lib/libzfs/libzfs_sendrecv.c b/lib/libzfs/libzfs_sendrecv.c
index 5a2e2aeb6d5350dedd4f518341398f779f984bb1..612a09914637214cff7e40445b0c89633ac03ec3 100644 (file)
--- a/lib/libzfs/libzfs_sendrecv.c
+++ b/lib/libzfs/libzfs_sendrecv.c
@@ -237,6 +237,8 @@ send_iterate_prop(zfs_handle_t *zhp, nvlist_t *nv)
                zfs_prop_t prop = zfs_name_to_prop(propname);
                nvlist_t *propnv;
 
+               assert(zfs_prop_user(propname) || prop != ZPROP_INVAL);
+
                if (!zfs_prop_user(propname) && zfs_prop_readonly(prop))
                        continue;
 
@@ -594,12 +596,18 @@ dump_filesystem(zfs_handle_t *zhp, void *arg)
                            zhp->zfs_name, sdd->fromsnap);
                        sdd->err = B_TRUE;
                } else if (!sdd->seento) {
-                       (void) fprintf(stderr,
-                           "WARNING: could not send %s@%s:\n"
-                           "incremental source (%s@%s) "
-                           "is not earlier than it\n",
-                           zhp->zfs_name, sdd->tosnap,
-                           zhp->zfs_name, sdd->fromsnap);
+                       if (sdd->fromsnap) {
+                               (void) fprintf(stderr,
+                                   "WARNING: could not send %s@%s:\n"
+                                   "incremental source (%s@%s) "
+                                   "is not earlier than it\n",
+                                   zhp->zfs_name, sdd->tosnap,
+                                   zhp->zfs_name, sdd->fromsnap);
+                       } else {
+                               (void) fprintf(stderr, "WARNING: "
+                                   "could not send %s@%s: does not exist\n",
+                                   zhp->zfs_name, sdd->tosnap);
+                       }
                        sdd->err = B_TRUE;
                }
        } else {