diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-10-01 21:07:07 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:07:37 -0500 |
| commit | b6678a276cdf0dde4848175d165b7ca62f73bce5 (patch) | |
| tree | ba389e5897d259a830bd9d2e8ddb69896b6db303 | |
| parent | ce7bccef5fa41d5445a97f32daf387c9ed85030e (diff) | |
| download | samba-b6678a276cdf0dde4848175d165b7ca62f73bce5.tar.gz samba-b6678a276cdf0dde4848175d165b7ca62f73bce5.tar.bz2 samba-b6678a276cdf0dde4848175d165b7ca62f73bce5.zip | |
r25450: Make it easier to test with a particular version of OpenLDAP, by
setting OPENLDAP_PATH, move to using hdb as the backend (allows
subtree renames), and re-enable the --quiet option.
Andrew Bartlett
(This used to be commit a186a0fa68cdcfb3abd430534657e5e278a5ebda)
| -rw-r--r-- | source4/selftest/env/Samba4.pm | 16 | ||||
| -rw-r--r-- | source4/setup/slapd.conf | 6 |
2 files changed, 16 insertions, 6 deletions
diff --git a/source4/selftest/env/Samba4.pm b/source4/selftest/env/Samba4.pm index 0cd9c2e2be..b074252c59 100644 --- a/source4/selftest/env/Samba4.pm +++ b/source4/selftest/env/Samba4.pm @@ -216,7 +216,7 @@ sub mk_openldap($$$) system("$self->{bindir}/ad2oLschema $configuration --option=convert:target=openldap -H $ldapdir/schema-tmp.ldb -I $self->{setupdir}/schema-map-openldap-2.3 -O $ldapdir/backend-schema.schema >&2") == 0 or die("schema conversion for OpenLDAP failed"); my $oldpath = $ENV{PATH}; - $ENV{PATH} = "/usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH}"; + $ENV{PATH} = "$ENV{OPENLDAP_PATH}/usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH}"; unlink($modconf); open(CONF, ">$modconf"); close(CONF); @@ -225,8 +225,18 @@ sub mk_openldap($$$) open(CONF, ">$modconf"); # enable slapd modules print CONF " +moduleload back_hdb +moduleload syncprov +"; + close(CONF); + } + + if (system("slaptest -u -f $slapd_conf >&2") != 0) { + open(CONF, ">$modconf"); + # enable slapd modules + print CONF " modulepath /usr/lib/ldap -moduleload back_bdb +moduleload back_hdb moduleload syncprov "; close(CONF); @@ -412,7 +422,7 @@ my @provision_options = ("$self->{bindir}/smbscript", "$self->{setupdir}/provisi push (@provision_options, split(' ', $configuration)); push (@provision_options, "--host-name=$netbiosname"); push (@provision_options, "--host-ip=$ifaceipv4"); -# push (@provision_options, "--quiet"); + push (@provision_options, "--quiet"); push (@provision_options, "--domain=$domain"); push (@provision_options, "--realm=$realm"); push (@provision_options, "--adminpass=$password"); diff --git a/source4/setup/slapd.conf b/source4/setup/slapd.conf index 34896d04b9..15e3610e3a 100644 --- a/source4/setup/slapd.conf +++ b/source4/setup/slapd.conf @@ -21,7 +21,7 @@ include ${LDAPDIR}/modules.conf defaultsearchbase ${DOMAINDN} -backend bdb +backend hdb database bdb suffix ${SCHEMADN} directory ${LDAPDIR}/db/schema @@ -32,7 +32,7 @@ index objectCategory eq index lDAPDisplayName eq index subClassOf eq -database bdb +database hdb suffix ${CONFIGDN} directory ${LDAPDIR}/db/config index objectClass eq @@ -45,7 +45,7 @@ index subClassOf eq index dnsRoot eq index nETBIOSName eq pres -database bdb +database hdb suffix ${DOMAINDN} rootdn ${LDAPMANAGERDN} rootpw ${LDAPMANAGERPASS} |