sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-09 09:57:48 +03:00
Code

r26305: Update template files and testsuite to try and work with current

Browse Source 
openldap, and fully support different LDAP server locations.

Andrew Bartlett
(This used to be commit a00bb942537f0f638c2a8295770749cb4b5d9ef3)
This commit is contained in:
Andrew Bartlett 2007-12-05 04:26:28 +01:00 committed by Stefan Metzmacher
parent 439f85c609
commit 8edcbc8474
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,9 +24,13 @@ sub new($$$$) {
sub openldap_start($$$) { sub openldap_start($$$) {
my ($slapd_conf, $uri, $logs) = @_; my ($slapd_conf, $uri, $logs) = @_;
my $oldpath = $ENV{PATH}; my $oldpath = $ENV{PATH};
$ENV{PATH} = "/usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH}"; my $olpath = "";
system("slapd -d0 -f $slapd_conf -h $uri > $logs 2>&1 &"); if (defined $ENV{OPENLDAP_PATH}) {
$olpath = "$ENV{OPENLDAP_PATH}:"
}
$ENV{PATH} = "$olpath/usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH}";
system("slapd -d63 -f $slapd_conf -h $uri > $logs 2>&1 &");
$ENV{PATH} = $oldpath; $ENV{PATH} = $oldpath;
} }

1
source4/setup/schema-map-openldap-2.3
View File

@ -11,6 +11,7 @@ distinguishedName
description description
cn cn
top top
memberOf
#This shouldn't make it to the ldap server #This shouldn't make it to the ldap server
sambaPassword sambaPassword
#These conflict with OpenLDAP builtins #These conflict with OpenLDAP builtins

8
source4/setup/slapd.conf
View File

@ -40,10 +40,10 @@ index samAccountName eq
index name eq index name eq
index objectSid eq index objectSid eq
index objectCategory eq index objectCategory eq
index nCName eq pres index nCName eq
index subClassOf eq index subClassOf eq
index dnsRoot eq index dnsRoot eq
index nETBIOSName eq pres index nETBIOSName eq
database hdb database hdb
suffix ${DOMAINDN} suffix ${DOMAINDN}
@ -60,11 +60,11 @@ index uidNumber eq
index gidNumber eq index gidNumber eq
index unixName eq index unixName eq
index privilege eq index privilege eq
index nCName eq pres index nCName eq
index lDAPDisplayName eq index lDAPDisplayName eq
index subClassOf eq index subClassOf eq
index dnsRoot eq index dnsRoot eq
index nETBIOSName eq pres index nETBIOSName eq
#syncprov is stable in OpenLDAP 2.3, and available in 2.2. #syncprov is stable in OpenLDAP 2.3, and available in 2.2.
#We only need this for the contextCSN attribute anyway.... #We only need this for the contextCSN attribute anyway....