selftest/Samba4: use DOMAIN/REALM from the dcvars instead of using hardcoded values
authorStefan Metzmacher <metze@samba.org>
Mon, 26 Feb 2018 13:19:39 +0000 (14:19 +0100)
committerAndreas Schneider <asn@cryptomilk.org>
Mon, 19 Mar 2018 19:30:51 +0000 (20:30 +0100)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13300

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
selftest/target/Samba4.pm

index fd4e4b61984369d3050b6b1458de924d3b4319dc..b537d74f31f31122af64b75f793e06cc52d78ed1 100755 (executable)
@@ -1049,8 +1049,8 @@ rpc_server:tcpip = no
        my $ret = $self->provision($prefix,
                                   "member server",
                                   $hostname,
-                                  "SAMBADOMAIN",
-                                  "samba.example.com",
+                                  $dcvars->{DOMAIN},
+                                  $dcvars->{REALM},
                                   "2008",
                                   "locMEMpass3",
                                   $dcvars->{SERVER_IP},
@@ -1125,8 +1125,8 @@ sub provision_rpc_proxy($$$)
        my $ret = $self->provision($prefix,
                                   "member server",
                                   "localrpcproxy",
-                                  "SAMBADOMAIN",
-                                  "samba.example.com",
+                                  $dcvars->{DOMAIN},
+                                  $dcvars->{REALM},
                                   "2008",
                                   "locRPCproxypass4",
                                   $dcvars->{SERVER_IP},
@@ -1209,8 +1209,8 @@ sub provision_promoted_dc($$$)
        # We do this so that we don't run the provision.  That's the job of 'samba-tool domain dcpromo'.
        my $ctx = $self->provision_raw_prepare($prefix, "domain controller",
                                               "promotedvdc",
-                                              "SAMBADOMAIN",
-                                              "samba.example.com",
+                                              $dcvars->{DOMAIN},
+                                              $dcvars->{REALM},
                                               "2008",
                                               $dcvars->{PASSWORD},
                                               $dcvars->{SERVER_IP},
@@ -1651,8 +1651,8 @@ sub provision_rodc($$$)
        # We do this so that we don't run the provision.  That's the job of 'net join RODC'.
        my $ctx = $self->provision_raw_prepare($prefix, "domain controller",
                                               "rodc",
-                                              "SAMBADOMAIN",
-                                              "samba.example.com",
+                                              $dcvars->{DOMAIN},
+                                              $dcvars->{REALM},
                                               "2008",
                                               $dcvars->{PASSWORD},
                                               $dcvars->{SERVER_IP},