X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fproto.c;h=00e3166c0e2765dd56f858d5131bbf9e8167b7c5;hb=0938509e0422363554023ab99381fd70a22a6e08;hp=f3a3b26ca2018bb27c50ab2ef36873178bf6c07e;hpb=3aa8182c3cc478bf723205f1a4dd84e160768448;p=libguestfs.git

diff --git a/daemon/proto.c b/daemon/proto.c
index f3a3b26..00e3166 100644
--- a/daemon/proto.c
+++ b/daemon/proto.c
@@ -167,14 +167,6 @@ main_loop (int _sock)
       reply_with_error ("unexpected message status (%d)", hdr.status);
       goto cont;
     }
-    /* This version of the daemon does not understand optional arguments
-     * at all.  When we fix this, we will remove the next conditional.
-     */
-    if (hdr.optargs_bitmask != 0) {
-      reply_with_error ("optargs_bitmask != 0 (%" PRIu64 ")",
-                        hdr.optargs_bitmask);
-      goto cont;
-    }
 
     proc_nr = hdr.proc;
     serial = hdr.serial;
@@ -425,6 +417,7 @@ receive_file (receive_cb cb, void *opaque)
       return 0;			/* end of file */
     }
 
+    /* Note that the callback can generate progress messages. */
     if (cb)
       r = cb (opaque, chunk.data.data_val, chunk.data.data_len);
     else