diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2007-04-17 00:30:01 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:50:56 -0500 |
commit | 2c247996a93f86472f34728f4834a3229d6ecf89 (patch) | |
tree | 777955fbbded3f6a1aec21a406f11899b6f6cd46 /source4/torture/util.c | |
parent | aacabe9c5731009458900c1d6dce9669b3e987be (diff) | |
download | samba-2c247996a93f86472f34728f4834a3229d6ecf89.tar.gz samba-2c247996a93f86472f34728f4834a3229d6ecf89.tar.xz samba-2c247996a93f86472f34728f4834a3229d6ecf89.zip |
r22286: Import branch that converted the Samba4 test target code to perl and makes the code a bit clearer.
(This used to be commit e3ba5ced0440e736f0f140e12a8c728f79a20bb2)
Diffstat (limited to 'source4/torture/util.c')
-rw-r--r-- | source4/torture/util.c | 71 |
1 files changed, 0 insertions, 71 deletions
diff --git a/source4/torture/util.c b/source4/torture/util.c index 11cb81ca064..55e4bc977fc 100644 --- a/source4/torture/util.c +++ b/source4/torture/util.c @@ -50,77 +50,6 @@ BOOL nt_time_equal(NTTIME *t1, NTTIME *t2) return *t1 == *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) -{ - char *tempdir; - NTSTATUS status; - pid_t pid; - int child_status; - char *configfile, *configparam; - pid_t closed_pid; - - *smbd_pid = -1; - - status = torture_temp_dir(mem_ctx, prefix, &tempdir); - if (NT_STATUS_IS_ERR(status)) { - return status; - } - - if ((pid = fork()) == 0) { - execl(setupdir_script, setupdir_script, tempdir, NULL); - exit(1); - } else if (pid == -1) { - DEBUG(0, ("Unable to fork()\n")); - return NT_STATUS_UNSUCCESSFUL; - } - - closed_pid = waitpid(pid, &child_status, 0); - - if (closed_pid == -1) { - DEBUG(1, ("Error waiting for child")); - return NT_STATUS_UNSUCCESSFUL; - } - - SMB_ASSERT(closed_pid == pid); - - if (!WIFEXITED(child_status) || WEXITSTATUS(child_status) != 0) { - DEBUG(1, ("Invalid return code from setup script %s: %d\n", - setupdir_script, - WEXITSTATUS(child_status))); - return NT_STATUS_UNSUCCESSFUL; - } - - configfile = talloc_asprintf(mem_ctx, "%s/etc/smb.conf", - tempdir); - if (!file_exist(configfile)) { - DEBUG(1, ("Setup script didn't create %s\n", configfile)); - return NT_STATUS_UNSUCCESSFUL; - } - - configparam = talloc_asprintf(mem_ctx, "--configfile=%s", configfile); - talloc_free(configfile); - - if ((pid = fork()) == 0) { - execl(smbd_path, smbd_path, "-i", "--model=single", - configparam, NULL); - exit(1); - } else if (pid == -1) { - DEBUG(0, ("Unable to fork()\n")); - return NT_STATUS_UNSUCCESSFUL; - } - - *smbd_pid = pid; - - return NT_STATUS_OK; -} - NTSTATUS torture_second_tcon(TALLOC_CTX *mem_ctx, struct smbcli_session *session, const char *sharename, |