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/setup | |
| 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/setup')
| -rwxr-xr-x | source4/setup/provision | 2 | ||||
| -rw-r--r-- | source4/setup/schema-map-openldap-2.3 | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source4/setup/provision b/source4/setup/provision index bf03026987..010f7e7708 100755 --- a/source4/setup/provision +++ b/source4/setup/provision @@ -141,7 +141,7 @@ if (ldapbackend) { subobj.LDAPBACKEND = subobj.LDAPI_URI; } if (!ldapmodule) { - subobj.LDAPMODULE = "entryUUID"; + subobj.LDAPMODULE = "entryuuid"; } subobj.DOMAINDN_LDB = subobj.LDAPBACKEND; subobj.DOMAINDN_MOD2 = "," + subobj.LDAPMODULE + ",paged_searches"; diff --git a/source4/setup/schema-map-openldap-2.3 b/source4/setup/schema-map-openldap-2.3 index 44fc3de6df..3bbd6d9e57 100644 --- a/source4/setup/schema-map-openldap-2.3 +++ b/source4/setup/schema-map-openldap-2.3 @@ -1,5 +1,4 @@ #Standard OpenLDAP attributes -name labeledURI createTimeStamp objectClass @@ -23,6 +22,8 @@ objectClasses:samba4ObjectClasses 2.5.21.6:1.3.6.1.4.1.7165.4.255.5 subSchema:samba4SubSchema 2.5.20.1:1.3.6.1.4.1.7165.4.255.4 +#'name' is the RDN in AD, but something else in OpenLDAP +name:samba4RDN #Remap these so that we don't put operational attributes in a schema MAY modifyTimeStamp:samba4ModifyTimestamp 2.5.18.2:1.3.6.1.4.1.7165.4.255.3 |