diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-05 14:02:30 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-05 14:02:30 +0100 |
| commit | de7dc2cec059305d28cc75a5347bfd88f3cb5c95 (patch) | |
| tree | a286f235cbbbbaff06f83a32e55b0199da6dd8e4 /source4/setup | |
| parent | ca05542d3defe76c3bce48eaff1fc749821a976c (diff) | |
| parent | 21b7b000fb53ac3025d0038cc551a47f9d4a743b (diff) | |
| download | samba-de7dc2cec059305d28cc75a5347bfd88f3cb5c95.tar.gz samba-de7dc2cec059305d28cc75a5347bfd88f3cb5c95.tar.bz2 samba-de7dc2cec059305d28cc75a5347bfd88f3cb5c95.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source4/setup')
| -rw-r--r-- | source4/setup/schema-map-openldap-2.3 | 5 | ||||
| -rw-r--r-- | source4/setup/schema_samba4.ldif | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/source4/setup/schema-map-openldap-2.3 b/source4/setup/schema-map-openldap-2.3 index 233f9a9613..0d38652dae 100644 --- a/source4/setup/schema-map-openldap-2.3 +++ b/source4/setup/schema-map-openldap-2.3 @@ -11,7 +11,6 @@ distinguishedName description cn top -entryTTL uidNumber gidNumber #The memberOf plugin provides this attribute @@ -30,6 +29,10 @@ 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 +dynamicObject:samba4DynaimcObject +1.3.6.1.4.1.1466.101.119.2:1.3.6.1.4.1.7165.4.255.8 +entryTTL:samba4EntryTTL +1.3.6.1.4.1.1466.101.119.3:1.3.6.1.4.1.7165.4.255.9 #MiddleName has a conflicting OID 2.16.840.1.113730.3.1.34:1.3.6.1.4.1.7165.4.255.1 #defaultGroup has a conflicting OID diff --git a/source4/setup/schema_samba4.ldif b/source4/setup/schema_samba4.ldif index d42795b94d..47010da637 100644 --- a/source4/setup/schema_samba4.ldif +++ b/source4/setup/schema_samba4.ldif @@ -189,6 +189,8 @@ oMSyntax: 20 #Allocated: (objectClasses) samba4ObjectClasses: 1.3.6.1.4.1.7165.4.255.5 #Allocated: (ditContentRules) samba4DitContentRules: 1.3.6.1.4.1.7165.4.255.6 #Allocated: (attributeTypes) samba4AttributeTypes: 1.3.6.1.4.1.7165.4.255.7 +#Allocated: (dynamicObject) samba4DynamicObject: 1.3.6.1.4.1.7165.4.255.8 +#Allocated: (entryTTL) samba4EntryTTL: 1.3.6.1.4.1.7165.4.255.9 # # Fedora DS uses this attribute, and we need to set it via our module stack |