diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2014-05-20 10:15:31 +1200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-06-16 02:53:48 +0200 |
| commit | 26ab17fa01ff89b3a67efad403561f404a3848a4 (patch) | |
| tree | cff59244791d43633b6175021c1225a0b5ed9f23 /selftest/target/Samba4.pm | |
| parent | ad533709e5f98230cc3f6b79afecf2c6e057a4b8 (diff) | |
| download | samba-26ab17fa01ff89b3a67efad403561f404a3848a4.tar.gz samba-26ab17fa01ff89b3a67efad403561f404a3848a4.tar.xz samba-26ab17fa01ff89b3a67efad403561f404a3848a4.zip | |
s4-winbind: Use winbindd in the AD DC for fl2003dc and plugin_s4_dc
(Including changes to knownfail to match the new winbindd in use in each environment)
Change-Id: I9e08086eba98e95e05a99afef28315e2857aae56
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Kamen Mazdrashki <kamenim@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Mon Jun 16 02:53:49 CEST 2014 on sn-devel-104
Diffstat (limited to 'selftest/target/Samba4.pm')
| -rwxr-xr-x | selftest/target/Samba4.pm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 7bdd396976d..c6e6ef9398c 100755 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -1315,6 +1315,8 @@ sub provision_fl2003dc($$) my ($self, $prefix) = @_; print "PROVISIONING DC..."; + my $extra_conf_options = "allow dns updates = nonsecure and secure + server services = +winbindd -winbind"; my $ret = $self->provision($prefix, "domain controller", "dc6", @@ -1322,7 +1324,7 @@ sub provision_fl2003dc($$) "samba2003.example.com", "2003", "locDCpass6", - undef, "allow dns updates = nonsecure and secure", "", undef); + undef, $extra_conf_options, "", undef); unless (defined $ret) { return undef; @@ -1513,6 +1515,7 @@ sub provision_plugin_s4_dc($$) lpq cache time = 0 print notify backchannel = yes + server services = +winbindd -winbind "; my $extra_smbconf_shares = " |