sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

selftest: Change chgdcpass environment to use winbindd

Browse Source 
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>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Jun 18 00:59:54 CEST 2015 on sn-devel-104
This commit is contained in:
Andrew Bartlett 2015-06-17 11:59:49 +12:00 committed by Jeremy Allison
parent 5de7621cbf
commit db59f9ec73
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
selftest/knownfail
View File

@ -255,12 +255,12 @@
^samba4.winbind.struct.show_sequence\(ad_dc_ntvfs:local\)
^samba.wbinfo_simple.\(ad_dc_ntvfs:local\).--allocate-uid
^samba.wbinfo_simple.\(ad_dc_ntvfs: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.\(ad_dc:local\).--allocate-uid
^samba.wbinfo_simple.\(ad_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
#
@ -307,21 +307,10 @@
^samba.blackbox.wbinfo\(ad_dc_ntvfs:local\).wbinfo -I against ad_dc_ntvfs\(ad_dc_ntvfs:local\)
^samba.blackbox.wbinfo\(ad_dc_ntvfs:local\).wbinfo --trusted-domains against ad_dc_ntvfs\(ad_dc_ntvfs:local\)
^samba.blackbox.wbinfo\(ad_dc_ntvfs:local\).wbinfo --all-domains against ad_dc_ntvfs\(ad_dc_ntvfs: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\)
#
# This will fail against the NTVFS DC, because it requires functionality only in winbindd
#
^samba4.winbind.pac.*\(ad_dc_ntvfs:local\) # Not implemented
^samba4.winbind.pac.*\(chgdcpass:local\) # Not implemented
#
# These do not work against winbindd in member mode for unknown reasons
#
@ -331,8 +320,6 @@
^samba.blackbox.wbinfo\(ad_member:local\).wbinfo -G check for sane mapping\(ad_member:local\)
^samba.ntlm_auth.\(ad_dc_ntvfs:local\).ntlm_auth against winbindd with failed require-membership-of
^samba.ntlm_auth.\(ad_dc_ntvfs: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
^samba4.winbind.struct.getdcname\(nt4_member:local\) # Works in other modes, just not against the classic/NT4 DC
#
# Differences in our KDC compared to windows

6
selftest/target/Samba4.pm
View File

@ -1799,7 +1799,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",
@ -1809,7 +1808,7 @@ sub provision_chgdcpass($$)
"chgDCpass1",
undef,
undef,
$extra_conf_options,
"",
"",
$extra_provision_options);
@ -1821,8 +1820,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;