r25112: make torture_temp_dir() available via tortore/torture.h

and return more detailed errors

metze

diff --git a/source/lib/registry/tests/hive.c b/source/lib/registry/tests/hive.c
index a71e31474c61a49d01293b5f7a53e65df802c946..dff6d1e8298aed84c073dab50299168ff343d526 100644 (file)
--- a/source/lib/registry/tests/hive.c
+++ b/source/lib/registry/tests/hive.c
@@ -27,9 +27,6 @@
 #include "librpc/gen_ndr/winreg.h"
 #include "system/filesys.h"
 
-NTSTATUS torture_temp_dir(struct torture_context *tctx, const char *prefix, 
-                                                                  const char **tempdir);
-
 static bool test_del_nonexistant_key(struct torture_context *tctx,
                                     const void *test_data)
 {

diff --git a/source/lib/registry/tests/registry.c b/source/lib/registry/tests/registry.c
index 9809a6d4c8dd8e6b766b6009205555239ce8063c..962c7fd2b5137d362b0babe07c868366a390d254 100644 (file)
--- a/source/lib/registry/tests/registry.c
+++ b/source/lib/registry/tests/registry.c
@@ -28,9 +28,6 @@
 #include "libcli/security/security.h"
 #include "system/filesys.h"
 
-NTSTATUS torture_temp_dir(struct torture_context *tctx, const char *prefix, 
-                                                                  const char **tempdir);
-
 /**
  * Test obtaining a predefined key.
  */

diff --git a/source/torture/ui.c b/source/torture/ui.c
index bb28803216686857a37f9be17026c1c61b800841..75d8a26dac0d1d3c8dcd6a8441e8d28c16eebf4d 100644 (file)
--- a/source/torture/ui.c
+++ b/source/torture/ui.c
@@ -24,6 +24,25 @@
 #include "lib/util/dlinklist.h"
 #include "param/param.h"
 
+/**
+ create a temporary directory.
+*/
+_PUBLIC_ NTSTATUS torture_temp_dir(struct torture_context *tctx, 
+                                  const char *prefix, 
+                                  char **tempdir)
+{
+       SMB_ASSERT(tctx->outputdir != NULL);
+
+       *tempdir = talloc_asprintf(tctx, "%s/%s.XXXXXX", tctx->outputdir, prefix);
+       NT_STATUS_HAVE_NO_MEMORY(*tempdir);
+
+       if (mkdtemp(*tempdir) == NULL) {
+               return map_nt_error_from_unix(errno);
+       }
+
+       return NT_STATUS_OK;
+}
+
 void torture_comment(struct torture_context *context, const char *comment, ...)
 {
        va_list ap;

diff --git a/source/torture/util.c b/source/torture/util.c
index b8bfa5f51f20c60ca1a9030b945968256c76d8c9..713004d8d2bacfc18f9f2194130e9acdeb936b08 100644 (file)
--- a/source/torture/util.c
+++ b/source/torture/util.c
@@ -24,22 +24,6 @@
 #include "libcli/raw/interfaces.h"
 #include "libcli/raw/libcliraw.h"
 
-/**
- create a temporary directory.
-*/
-_PUBLIC_ NTSTATUS torture_temp_dir(struct torture_context *tctx, 
-                                  const char *prefix, 
-                                  char **tempdir)
-{
-       SMB_ASSERT(tctx->outputdir != NULL);
-       *tempdir = talloc_asprintf(tctx, "%s/%s.XXXXXX", tctx->outputdir, prefix);
-
-       if (mkdtemp(*tempdir) == NULL)
-               return NT_STATUS_UNSUCCESSFUL;
-
-       return NT_STATUS_OK;
-}
-
 /**
   check if 2 NTTIMEs are equal.
 */