X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fbase64.c;h=f55e1f51d72be7efeafd40be9df850de42b007ff;hb=16da7589e91b0030fb5564553447f80b97c0b18c;hp=1d2d1d0f23f2632208febe28c475ed8f3540c45a;hpb=50eed6d20de9b6d16975c3c0bbf6e545f8fba1fe;p=libguestfs.git

diff --git a/daemon/base64.c b/daemon/base64.c
index 1d2d1d0..f55e1f5 100644
--- a/daemon/base64.c
+++ b/daemon/base64.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <fcntl.h>
 
-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"
 
@@ -77,8 +77,11 @@ do_base64_in (const char *file)
     return -1;
   }
   if (r == -2) {		/* cancellation from library */
+    /* This error is ignored by the library since it initiated the
+     * cancel.  Nevertheless we must send an error reply here.
+     */
+    reply_with_error ("file upload cancelled");
     pclose (fp);
-    /* Do NOT send any error. */
     return -1;
   }