diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-11-27 02:26:47 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:46:19 +0100 |
| commit | adef944c4314daded57d21b8f1dd2a1b8156740e (patch) | |
| tree | 03013a3a99a051b61d296ff5c4bebba9cca7e10a /source4/selftest/env | |
| parent | 0ac6bffdf46003517127fbd9763f74e09e96c21a (diff) | |
| download | samba-adef944c4314daded57d21b8f1dd2a1b8156740e.tar.gz samba-adef944c4314daded57d21b8f1dd2a1b8156740e.tar.bz2 samba-adef944c4314daded57d21b8f1dd2a1b8156740e.zip | |
r26137: Rename the entryUUID module to better match it's purpose: being a
simple ldap mapping (a complex mapping will follow).
Fix the module to handle 'name' better, rather than using the 'name'
attribute built into OpenLDAP, rename to samba4RDN. We need to see if
this can be handled in the backend.
Also rename the functions and inernal module name to entryuuid for
consistancy.
Andrew Bartlett
(This used to be commit a7be80766f4270d63433bbd6a976ebf302ed3433)
Diffstat (limited to 'source4/selftest/env')
| -rw-r--r-- | source4/selftest/env/Samba4.pm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source4/selftest/env/Samba4.pm b/source4/selftest/env/Samba4.pm index d7c37fab3e..2f846bbdb0 100644 --- a/source4/selftest/env/Samba4.pm +++ b/source4/selftest/env/Samba4.pm @@ -220,7 +220,11 @@ 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} = "$ENV{OPENLDAP_PATH}/usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH}"; + my $olpath = ""; + if (defined $ENV{OPENLDAP_PATH}) { + $olpath = "$ENV{OPENLDAP_PATH}:" + } + $ENV{PATH} = "$olpath/usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH}"; unlink($modconf); open(CONF, ">$modconf"); close(CONF); |