selftest: use test smb.conf in provision
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>
Fri, 29 Mar 2019 01:12:49 +0000 (14:12 +1300)
committerDouglas Bagnall <dbagnall@samba.org>
Sat, 30 Mar 2019 22:21:26 +0000 (22:21 +0000)
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Tim Beale <timbeale@catalyst.net.nz>
selftest/target/Samba4.pm

index ec587aae3b4d0c3053bec11cc3ebe2b26af51f1f..bc5f885ddd5c8dec2b0bdcea47359d16aad1ef2f 100755 (executable)
@@ -998,6 +998,7 @@ sub provision_raw_step2($$$)
        $ldbmodify .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
        $ldbmodify .= "KRB5CCNAME=\"$ret->{KRB5_CCACHE}\" ";
        $ldbmodify .= Samba::bindir_path($self, "ldbmodify");
+       $ldbmodify .=  " --configfile=$ctx->{smb_conf}";
        my $base_dn = "DC=".join(",DC=", split(/\./, $ctx->{realm}));
 
        if ($ctx->{server_role} ne "domain controller") {
@@ -1098,7 +1099,7 @@ servicePrincipalName: http/testupnspn.$ctx->{dnsname}
        $ldbmodify .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
        $ldbmodify .= "KRB5CCNAME=\"$ret->{KRB5_CCACHE}\" ";
        $ldbmodify .= Samba::bindir_path($self, "ldbmodify");
-
+       $ldbmodify .=  " --configfile=$ctx->{smb_conf}";
        my $base_dn = "DC=".join(",DC=", split(/\./, $ctx->{realm}));
        my $user_dn = "cn=jane,cn=users,$base_dn";