selftest: Change chgdcpass environment to use winbindd

This allows us to test that winbindd starts up without secrets.tdb, as happens after
a classicupgrade.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10991
(backport of master commit db59f9ec731e3abbeba3070925a6dedaac26e6e5)

diff --git a/selftest/knownfail b/selftest/knownfail
index d42830f5d46b7a03222f12cc041a01d3be9e9028..7a89fdec8f8d9e4a381c5f6137bfb855f3b5fc8e 100644 (file)
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -257,12 +257,12 @@
 ^samba4.winbind.struct.show_sequence\(dc\)
 ^samba.wbinfo_simple.\(dc:local\).--allocate-uid
 ^samba.wbinfo_simple.\(dc:local\).--allocate-gid
-^samba.wbinfo_simple.\(chgdcpass:local\).--allocate-uid
-^samba.wbinfo_simple.\(chgdcpass:local\).--allocate-gid
 ^samba.wbinfo_simple.\(s4member:local\).--allocate-uid
 ^samba.wbinfo_simple.\(s4member:local\).--allocate-gid
 ^samba.wbinfo_simple.\(plugin_s4_dc:local\).--allocate-uid
 ^samba.wbinfo_simple.\(plugin_s4_dc:local\).--allocate-gid
+^samba.wbinfo_simple.\(chgdcpass:local\).--allocate-uid
+^samba.wbinfo_simple.\(chgdcpass:local\).--allocate-gid
 #
 # These do not work against winbindd in member mode for unknown reasons
 #
@@ -289,16 +289,6 @@
 ^samba.blackbox.wbinfo\(dc:local\).wbinfo -I against dc\(dc:local\)
 ^samba.blackbox.wbinfo\(dc:local\).wbinfo  --trusted-domains against dc\(dc:local\)
 ^samba.blackbox.wbinfo\(dc:local\).wbinfo --all-domains against dc\(dc:local\)
-^samba.wbinfo_simple.\(chgdcpass:local\).--all-domains.wbinfo\(chgdcpass:local\)
-^samba.wbinfo_simple.\(chgdcpass:local\).--trusted-domains.wbinfo\(chgdcpass:local\)
-^samba.wbinfo_simple.\(chgdcpass:local\).--online-status.wbinfo\(chgdcpass:local\)
-^samba.wbinfo_simple.\(chgdcpass:local\).--online-status --domain=BUILTIN.wbinfo\(chgdcpass:local\)
-^samba.wbinfo_simple.\(chgdcpass:local\).--online-status --domain=CHDCDOMAIN.wbinfo\(chgdcpass:local\)
-^samba.wbinfo_simple.\(chgdcpass:local\).--change-secret --domain=CHDCDOMAIN.wbinfo\(chgdcpass:local\)
-^samba.wbinfo_simple.\(chgdcpass:local\).--online-status --domain=CHDCDOMAIN.wbinfo\(chgdcpass:local\)
-^samba.blackbox.wbinfo\(chgdcpass:local\).wbinfo -I against chgdcpass\(chgdcpass:local\)
-^samba.blackbox.wbinfo\(chgdcpass:local\).wbinfo  --trusted-domains against chgdcpass\(chgdcpass:local\)
-^samba.blackbox.wbinfo\(chgdcpass:local\).wbinfo --all-domains against chgdcpass\(chgdcpass:local\)
 #
 # These do not work against winbindd in member mode for unknown reasons
 #
@@ -308,5 +298,3 @@
 ^samba.blackbox.wbinfo\(s3member:local\).wbinfo -G check for sane mapping\(s3member:local\)
 ^samba.ntlm_auth.\(dc:local\).ntlm_auth against winbindd with failed require-membership-of
 ^samba.ntlm_auth.\(dc:local\).ntlm_auth with NTLMSSP gss-spnego-client and gss-spnego server against winbind with failed require-membership-of
-^samba.ntlm_auth.\(chgdcpass:local\).ntlm_auth against winbindd with failed require-membership-of
-^samba.ntlm_auth.\(chgdcpass:local\).ntlm_auth with NTLMSSP gss-spnego-client and gss-spnego server against winbind with failed require-membership-of

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 342de582a768385f6bedfc9aea36926764a8739e..f7e24470731409efa115fe557b88e2c41d11ee56 100755 (executable)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1639,7 +1639,6 @@ sub provision_chgdcpass($$)
        print "PROVISIONING CHGDCPASS...";
        my $extra_provision_options = undef;
        push (@{$extra_provision_options}, "--dns-backend=BIND9_DLZ");
-       my $extra_conf_options = "server services = +winbind -winbindd";
        my $ret = $self->provision($prefix,
                                   "domain controller",
                                   "chgdcpass",
@@ -1647,8 +1646,7 @@ sub provision_chgdcpass($$)
                                   "chgdcpassword.samba.example.com",
                                   "2008",
                                   "chgDCpass1",
-                                  undef, $extra_conf_options, "",
-                                  $extra_provision_options);
+                                  undef, "", "", $extra_provision_options);
 
        return undef unless(defined $ret);
        unless($self->add_wins_config("$prefix/private")) {
@@ -1658,8 +1656,7 @@ sub provision_chgdcpass($$)
        
        # Remove secrets.tdb from this environment to test that we
        # still start up on systems without the new matching
-       # secrets.tdb records.  For this reason we don't run winbindd
-       # in this environment
+       # secrets.tdb records.  
        unless (unlink("$ret->{PRIVATEDIR}/secrets.tdb") || unlink("$ret->{PRIVATEDIR}/secrets.ntdb")) {
                warn("Unable to remove $ret->{PRIVATEDIR}/secrets.tdb added during provision");
                return undef;