diff options
| author | Martin Schwenke <martin@meltin.net> | 2020-10-29 09:05:37 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2020-11-02 10:20:45 +0000 |
| commit | 4bf010309cd747a42069cb5469ccb7711364ef18 (patch) | |
| tree | 8faec5c2ffe09b4ab102956b772e5512c4a50c50 /selftest | |
| parent | 65ab8cb014ca7ac97433ec53d6d163e6da5a3fe7 (diff) | |
| download | samba-4bf010309cd747a42069cb5469ccb7711364ef18.tar.gz | |
selftest: Drop dummy environment variables for CTDB daemons
This existed to avoid UID_WRAPPER_ROOT=1 causing ctdbd to fail to
chown the socket. The chown is no longer done in test mode so remove
this confusing hack.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Mon Nov 2 10:20:45 UTC 2020 on sn-devel-184
Diffstat (limited to 'selftest')
| -rwxr-xr-x | selftest/target/Samba3.pm | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index cfa2677a673..5623e2a149f 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -3414,20 +3414,13 @@ sub check_or_start_ctdb($$) { my $cmd = "ctdb/tests/local_daemons.sh"; my @full_cmd = ("$cmd", "$prefix", "start", "$i"); - # Dummy environment variables to avoid - # Samba3::get_env_for_process() from generating them - # and including UID_WRAPPER_ROOT=1, which causes - # "Unable to secure ctdb socket" error. - my $env_vars = { - CTDB_DUMMY => "1", - }; my $daemon_ctx = { NAME => "ctdbd", BINARY_PATH => $cmd, FULL_CMD => [ @full_cmd ], TEE_STDOUT => 1, LOG_FILE => "/dev/null", - ENV_VARS => $env_vars, + ENV_VARS => {}, }; print "STARTING CTDBD (node ${i})\n"; |