sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

r26424: Patch and hits from Howard Chu <hyc@symas.com> for our automated setup

Browse Source 
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)
This commit is contained in:
Andrew Bartlett 2007-12-13 09:46:41 +01:00 committed by Stefan Metzmacher
parent 21b024aa82
commit 03f178a728
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source4/selftest/env/Samba4.pm vendored
View File

@ -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}";

2
source4/setup/slapd.conf
View File

@ -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