diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-12-13 09:46:41 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:49:51 +0100 |
| commit | 03f178a728ba41f6ec82d35201ad25421e1bb951 (patch) | |
| tree | 11ff8c402dfd4b21649e805b84f45b9a818033fb /source4 | |
| parent | 21b024aa82b49a05919e89885e60913c8cb444b2 (diff) | |
| download | samba-03f178a728ba41f6ec82d35201ad25421e1bb951.tar.gz samba-03f178a728ba41f6ec82d35201ad25421e1bb951.tar.bz2 samba-03f178a728ba41f6ec82d35201ad25421e1bb951.zip | |
r26424: Patch and hits from Howard Chu <hyc@symas.com> for our automated setup
of OpenLDAP.
This makes it consistant with the Fedora DS setup, and doesn't mix
both hdb and bdb.
Andrew Bartlett
(This used to be commit 1ffada95d269c8f7d054bec7f6eaff8449995d40)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/selftest/env/Samba4.pm | 12 | ||||
| -rw-r--r-- | source4/setup/slapd.conf | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/source4/selftest/env/Samba4.pm b/source4/selftest/env/Samba4.pm index 9e3c29b32b..dbddb25465 100644 --- a/source4/selftest/env/Samba4.pm +++ b/source4/selftest/env/Samba4.pm @@ -25,9 +25,11 @@ sub new($$$$) { sub openldap_start($$$) { my ($slapd_conf, $uri, $logs) = @_; my $oldpath = $ENV{PATH}; + my $olroot = ""; my $olpath = ""; - if (defined $ENV{OPENLDAP_PATH}) { - $olpath = "$ENV{OPENLDAP_PATH}:" + if (defined $ENV{OPENLDAP_ROOT}) { + $olroot = "$ENV{OPENLDAP_ROOT}"; + $olpath = "$olroot/libexec:$olroot/sbin:"; } $ENV{PATH} = "$olpath/usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH}"; system("slapd -d63 -f $slapd_conf -h $uri > $logs 2>&1 &"); @@ -225,8 +227,10 @@ sub mk_openldap($$$) my $oldpath = $ENV{PATH}; my $olpath = ""; - if (defined $ENV{OPENLDAP_PATH}) { - $olpath = "$ENV{OPENLDAP_PATH}:" + my $olroot = ""; + if (defined $ENV{OPENLDAP_ROOT}) { + $olroot = "$ENV{OPENLDAP_ROOT}"; + $olpath = "$olroot/libexec:$olroot/sbin:"; } $ENV{PATH} = "$olpath/usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH}"; diff --git a/source4/setup/slapd.conf b/source4/setup/slapd.conf index 0fd018e943..446facbf3d 100644 --- a/source4/setup/slapd.conf +++ b/source4/setup/slapd.conf @@ -22,7 +22,7 @@ include ${LDAPDIR}/modules.conf defaultsearchbase ${DOMAINDN} backend hdb -database bdb +database hdb suffix ${SCHEMADN} directory ${LDAPDIR}/db/schema index objectClass eq |