diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-06-26 20:09:35 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:09:33 -0500 |
| commit | 1afab0e36f87373805841bc80d2ab3b8437a5917 (patch) | |
| tree | e9cdddb568e04950ab310a8086e38435416e20ca /source4/torture/util.c | |
| parent | 6b749f225e8d1c910820a6576952f130e72bab84 (diff) | |
| download | samba-1afab0e36f87373805841bc80d2ab3b8437a5917.tar.gz samba-1afab0e36f87373805841bc80d2ab3b8437a5917.tar.bz2 samba-1afab0e36f87373805841bc80d2ab3b8437a5917.zip | |
r16527: Add target argument for smbtorture.
Remove duplicate unc path separator conversion.
Add prefix for tempdirs.
(This used to be commit 3763ed3092fa89558390a9721be8437a7c380790)
Diffstat (limited to 'source4/torture/util.c')
| -rw-r--r-- | source4/torture/util.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source4/torture/util.c b/source4/torture/util.c index 5df90163ad..d59de9459f 100644 --- a/source4/torture/util.c +++ b/source4/torture/util.c @@ -26,9 +26,10 @@ /** create a temporary directory. */ -_PUBLIC_ NTSTATUS torture_temp_dir(TALLOC_CTX *mem_ctx, char **tempdir) +_PUBLIC_ NTSTATUS torture_temp_dir(TALLOC_CTX *mem_ctx, const char *prefix, + char **tempdir) { - *tempdir = talloc_strdup(mem_ctx, "torture-tmp.XXXXXX"); + *tempdir = talloc_asprintf(mem_ctx, "torture.tmp-%s.XXXXXX", prefix); if (mkdtemp(*tempdir) == NULL) return NT_STATUS_UNSUCCESSFUL; @@ -48,6 +49,7 @@ BOOL nt_time_equal(NTTIME *t1, NTTIME *t2) * Provision a Samba installation using @param setupdir_script and start smbd. */ NTSTATUS torture_setup_server(TALLOC_CTX *mem_ctx, + const char *prefix, const char *setupdir_script, const char *smbd_path, pid_t *smbd_pid) @@ -61,7 +63,7 @@ NTSTATUS torture_setup_server(TALLOC_CTX *mem_ctx, *smbd_pid = -1; - status = torture_temp_dir(mem_ctx, &tempdir); + status = torture_temp_dir(mem_ctx, prefix, &tempdir); if (NT_STATUS_IS_ERR(status)) { return status; } |