diff options
| author | Stefan Metzmacher <metze@samba.org> | 2017-06-09 14:53:40 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2017-06-13 22:46:14 +0200 |
| commit | 9df42902029f1eb6b1050200ccbda7673b72e202 (patch) | |
| tree | 4314f1f18466b1657edbbfa613ed1ac125e1dcf3 /selftest/target/Samba3.pm | |
| parent | 6355473fabb280a5d10650cecf3b4d9851d21b5d (diff) | |
| download | samba-9df42902029f1eb6b1050200ccbda7673b72e202.tar.gz | |
selftest: don't use hardcoded domain names in Samba3::setup_admember()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'selftest/target/Samba3.pm')
| -rwxr-xr-x | selftest/target/Samba3.pm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 0914affecbf..32d10b5db08 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -385,26 +385,26 @@ sub setup_admember($$$$) my $share_dir="$prefix_abs/share"; push(@dirs, $share_dir); - my $substitution_path = "$share_dir/D_SAMBADOMAIN"; + my $substitution_path = "$share_dir/D_$dcvars->{DOMAIN}"; push(@dirs, $substitution_path); - $substitution_path = "$share_dir/D_SAMBADOMAIN/U_alice"; + $substitution_path = "$share_dir/D_$dcvars->{DOMAIN}/U_alice"; push(@dirs, $substitution_path); - $substitution_path = "$share_dir/D_SAMBADOMAIN/U_alice/G_domain users"; + $substitution_path = "$share_dir/D_$dcvars->{DOMAIN}/U_alice/G_domain users"; push(@dirs, $substitution_path); # Using '/' as the winbind separator is a bad idea ... - $substitution_path = "$share_dir/D_SAMBADOMAIN/u_SAMBADOMAIN"; + $substitution_path = "$share_dir/D_$dcvars->{DOMAIN}/u_$dcvars->{DOMAIN}"; push(@dirs, $substitution_path); - $substitution_path = "$share_dir/D_SAMBADOMAIN/u_SAMBADOMAIN/alice"; + $substitution_path = "$share_dir/D_$dcvars->{DOMAIN}/u_$dcvars->{DOMAIN}/alice"; push(@dirs, $substitution_path); - $substitution_path = "$share_dir/D_SAMBADOMAIN/u_SAMBADOMAIN/alice/g_SAMBADOMAIN"; + $substitution_path = "$share_dir/D_$dcvars->{DOMAIN}/u_$dcvars->{DOMAIN}/alice/g_$dcvars->{DOMAIN}"; push(@dirs, $substitution_path); - $substitution_path = "$share_dir/D_SAMBADOMAIN/u_SAMBADOMAIN/alice/g_SAMBADOMAIN/domain users"; + $substitution_path = "$share_dir/D_$dcvars->{DOMAIN}/u_$dcvars->{DOMAIN}/alice/g_$dcvars->{DOMAIN}/domain users"; push(@dirs, $substitution_path); my $member_options = " |