X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fdir.c;h=1ca62868ea9a091a0ab05f27787e8959e2a7ef37;hp=ad1c7c98792264286b3b94e45264be574028f599;hb=2b891ceef355ce2d6532d65f8febbe3833d4399e;hpb=84fc760439e82e6b3616abd0d1f9bd7d7eb01ec0

diff --git a/daemon/dir.c b/daemon/dir.c
index ad1c7c9..1ca6286 100644
--- a/daemon/dir.c
+++ b/daemon/dir.c
@@ -185,31 +185,22 @@ do_is_dir (const char *path)
 }
 
 char *
-do_mkdtemp (char *template)
+do_mkdtemp (const char *template)
 {
-  char *r;
-
-  NEED_ROOT (return NULL);
-  ABS_PATH (template, return NULL);
+  char *writable = strdup (template);
+  if (writable == NULL) {
+    reply_with_perror ("strdup");
+    return NULL;
+  }
 
   CHROOT_IN;
-  r = mkdtemp (template);
+  char *r = mkdtemp (writable);
   CHROOT_OUT;
 
   if (r == NULL) {
     reply_with_perror ("mkdtemp: %s", template);
-    return NULL;
+    free (writable);
   }
 
-  /* The caller will free template AND try to free the return value,
-   * so we must make a copy here.
-   */
-  if (r == template) {
-    r = strdup (template);
-    if (r == NULL) {
-      reply_with_perror ("strdup");
-      return NULL;
-    }
-  }
   return r;
 }