diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-03-13 09:55:06 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-03-13 09:55:06 +1100 |
| commit | 07a7c8fa0d76cb7cb10cc88fb5bbe5439b746d01 (patch) | |
| tree | 473ca1a63f7f9c777b6e600423e3d3b1daa9e124 /source4/selftest | |
| parent | 6f2935d082687eee23dbc9f1108162cf1670831a (diff) | |
| download | samba-07a7c8fa0d76cb7cb10cc88fb5bbe5439b746d01.tar.gz samba-07a7c8fa0d76cb7cb10cc88fb5bbe5439b746d01.tar.bz2 samba-07a7c8fa0d76cb7cb10cc88fb5bbe5439b746d01.zip | |
Update the provision scripts and selftest for LDAP
This should allow us to provision onto an OpenLDAP backend again.
Also ensure we always have a sysvol and netlogon share in the selftest
environment.
Andrew Bartlett
(This used to be commit b2d9b03ba3434e76d4d476233a198728523d17f9)
Diffstat (limited to 'source4/selftest')
| -rw-r--r-- | source4/selftest/target/Samba4.pm | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source4/selftest/target/Samba4.pm b/source4/selftest/target/Samba4.pm index 48fda17599..2b94135355 100644 --- a/source4/selftest/target/Samba4.pm +++ b/source4/selftest/target/Samba4.pm @@ -617,6 +617,14 @@ sub provision($$$$$$) read only = no ntvfs handler = simple +[sysvol] + path = $lockdir/sysvol + read only = yes + +[netlogon] + path = $lockdir/sysvol/$dnsname/scripts + read only = no + [cifsposix] copy = simple ntvfs handler = cifsposix @@ -746,7 +754,7 @@ nogroup:x:65534:nobody if (defined($self->{ldap})) { push (@provision_options, "--ldap-backend=$ldap_uri"); - system("$self->{bindir}/smbscript $self->{setupdir}/provision-backend $configuration --ldap-manager-pass=$password --root=$unix_name --realm=$realm --host-name=$netbiosname --ldap-backend-type=$self->{ldap}>&2") == 0 or die("backend provision failed"); + system("$self->{bindir}/smbpython $self->{setupdir}/provision-backend $configuration --ldap-manager-pass=$password --root=$unix_name --realm=$realm --domain=$domain --host-name=$netbiosname --ldap-backend-type=$self->{ldap}>&2") == 0 or die("backend provision failed"); if ($self->{ldap} eq "openldap") { ($ret->{SLAPD_CONF}, $ret->{OPENLDAP_PIDFILE}) = $self->mk_openldap($ldapdir, $configuration) or die("Unable to create openldap directories"); |