diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-05-30 00:36:23 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:53:05 -0500 |
| commit | 55ee74f8ca9204d7f48bba48d3f775744d11fccd (patch) | |
| tree | 206169b65e2dadcfa26102a19297087e6e8894b9 /source4 | |
| parent | 66d0f5c7a35d2a4b1dd9c444d7f68d779ab6fc18 (diff) | |
| download | samba-55ee74f8ca9204d7f48bba48d3f775744d11fccd.tar.gz samba-55ee74f8ca9204d7f48bba48d3f775744d11fccd.tar.bz2 samba-55ee74f8ca9204d7f48bba48d3f775744d11fccd.zip | |
r23233: Use the schema and basedn files generated by the provision-backend script.
(Moving towards using only the script's output, one step at a time).
Andrew Bartlett
(This used to be commit a7a409074a53b6b35727a454f1ecbe5daf376aad)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/selftest/Samba4.pm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source4/selftest/Samba4.pm b/source4/selftest/Samba4.pm index 1f84ec7c88..e579123d3a 100644 --- a/source4/selftest/Samba4.pm +++ b/source4/selftest/Samba4.pm @@ -332,11 +332,8 @@ syncprov-sessionlog 100 write_openldap_dbconfig("$ldapdir/db/config"); write_openldap_dbconfig("$ldapdir/db/schema"); - #This uses the provision we just did, to read out the schema - system("$self->{bindir}/ad2oLschema $configuration -H $privatedir/sam.ldb -I $self->{setupdir}/schema-map-openldap-2.3 -O $ldapdir/ad.schema >&2") == 0 or die("schema conversion for OpenLDAP failed"); - - #Now create an LDAP baseDN - system("$self->{bindir}/smbscript $self->{setupdir}/provision $provision_options --ldap-base >&2") == 0 or die("creating an OpenLDAP basedn failed"); + #This uses the provision-backend we just did, to read out the schema + system("$self->{bindir}/ad2oLschema $configuration -H $ldapdir/schema-tmp.ldb -I $self->{setupdir}/schema-map-openldap-2.3 -O $ldapdir/ad.schema >&2") == 0 or die("schema conversion for OpenLDAP failed"); my $oldpath = $ENV{PATH}; $ENV{PATH} = "/usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH}"; |