X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Ffile.c;h=24398339b408f343cb0dec971921ef8be009ffab;hb=refs%2Ftags%2F1.0.10;hp=c09de71f669cd3b58ca3eb13adcee953f851cb3f;hpb=161018ed1e90c796e6e099859979da02d5f3e410;p=libguestfs.git

diff --git a/daemon/file.c b/daemon/file.c
index c09de71..2439833 100644
--- a/daemon/file.c
+++ b/daemon/file.c
@@ -40,7 +40,7 @@ do_touch (const char *path)
   ABS_PATH (path, -1);
 
   CHROOT_IN;
-  fd = open (path, O_WRONLY | O_CREAT | O_NOCTTY | O_NONBLOCK, 0666);
+  fd = open (path, O_WRONLY | O_CREAT | O_NOCTTY, 0666);
   CHROOT_OUT;
 
   if (fd == -1) {
@@ -293,7 +293,7 @@ do_write_file (const char *path, const char *content, int size)
     size = strlen (content);
 
   CHROOT_IN;
-  fd = open (path, O_WRONLY | O_CREAT | O_NOCTTY | O_NONBLOCK, 0666);
+  fd = open (path, O_WRONLY | O_TRUNC | O_CREAT | O_NOCTTY, 0666);
   CHROOT_OUT;
 
   if (fd == -1) {
@@ -323,7 +323,7 @@ do_file (const char *path)
   int r, len, freeit = 0;
   char *buf;
 
-  /*NEED_ROOT (NULL); - no: we allow people to run this on /dev devices. */
+  NEED_ROOT_OR_IS_DEVICE (path, NULL);
   ABS_PATH (path, NULL);
 
   if (strncmp (path, "/dev/", 5) == 0)