selftest: Remove need for $RODC_DC_SERVER env variable

Same deal as earlier patch - we can use the $SERVER env variable instead
and avoid the need for this extra variable.

Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 3ee4abfd05f54f323440fb547f7918f5f9e2ea4f..9aea62a3d2aad679be7a6c2dfbaae7333cd0b7c2 100755 (executable)
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -834,9 +834,6 @@ my @exported_envvars = (
        "DC_NETBIOSNAME",
        "DC_NETBIOSALIAS",
 
-       # domain controller stuff for RODC
-       "RODC_DC_SERVER",
-
        # server stuff
        "SERVER",
        "SERVER_IP",

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 4446cadb5e7b66782376ff07c53098a1441a3130..a81da21c94b238b84de87c20ccc05d381c0b8992 100755 (executable)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1920,8 +1920,6 @@ sub provision_rodc($$$)
        Samba::mk_krb5_conf($ctx);
        Samba::mk_mitkdc_conf($ctx, abs_path(Samba::bindir_path($self, "shared")));
 
-       $ret->{RODC_DC_SERVER} = $ret->{SERVER};
-
        $ret->{DC_SERVER} = $dcvars->{DC_SERVER};
        $ret->{DC_SERVER_IP} = $dcvars->{DC_SERVER_IP};
        $ret->{DC_SERVER_IPV6} = $dcvars->{DC_SERVER_IPV6};

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 77d39a373931bebacab1bc2b2df5515e459ee178..abc0523c735244342f0ae6c1f5aacdd8118d836c 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -913,7 +913,7 @@ plantestsuite_loadlist("samba4.ldap.rodc_rwdc.python(rodc)", "rodc:local",
 planoldpythontestsuite("rodc:local", "replica_sync_rodc",
                        extra_path=[os.path.join(samba4srcdir, 'torture/drs/python')],
                        name="samba4.drs.replica_sync_rodc.python(rodc)",
-                       environ={'DC1': '$DC_SERVER', 'DC2': '$RODC_DC_SERVER'},
+                       environ={'DC1': '$DC_SERVER', 'DC2': '$SERVER'},
                       extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'],
                        py3_compatible=True)