diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 01:07:06 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 01:07:06 +0100 |
| commit | 40992617d12b3a3ae47139304a3ee9c8e79e8e86 (patch) | |
| tree | 86a429b68f454e9dd06040e1d71f430e9376d829 /source4/selftest | |
| parent | c9290a86dd0bddba23ec43527ab52503b962963d (diff) | |
| parent | 0b1a24681e6b41129e05a9612610fade27aecd4d (diff) | |
| download | samba-40992617d12b3a3ae47139304a3ee9c8e79e8e86.tar.gz samba-40992617d12b3a3ae47139304a3ee9c8e79e8e86.tar.bz2 samba-40992617d12b3a3ae47139304a3ee9c8e79e8e86.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
(This used to be commit 1bb673ce4e84088bc77d490101e8904cf9a467a2)
Diffstat (limited to 'source4/selftest')
| -rw-r--r-- | source4/selftest/target/Samba4.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/selftest/target/Samba4.pm b/source4/selftest/target/Samba4.pm index 563aca876e..11d4c85aee 100644 --- a/source4/selftest/target/Samba4.pm +++ b/source4/selftest/target/Samba4.pm @@ -729,9 +729,10 @@ nogroup:x:65534:nobody if ($self->{ldap} eq "openldap") { ($ret->{SLAPD_CONF}, $ret->{OPENLDAP_PIDFILE}) = $self->mk_openldap($ldapdir, $configuration) or die("Unable to create openldap directories"); + push (@provision_options, "--ldap-backend-type=openldap"); } elsif ($self->{ldap} eq "fedora-ds") { ($ret->{FEDORA_DS_DIR}, $ret->{FEDORA_DS_PIDFILE}) = $self->mk_fedora_ds($ldapdir, $configuration) or die("Unable to create fedora ds directories"); - push (@provision_options, "--ldap-module=nsuniqueid"); + push (@provision_options, "--ldap-backend-type=fedora-ds"); push (@provision_options, "'--aci=aci:: KHRhcmdldGF0dHIgPSAiKiIpICh2ZXJzaW9uIDMuMDthY2wgImZ1bGwgYWNjZXNzIHRvIGFsbCBieSBhbGwiO2FsbG93IChhbGwpKHVzZXJkbiA9ICJsZGFwOi8vL2FueW9uZSIpOykK'"); } |