diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2009-11-13 09:58:20 -0600 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-11-16 07:57:40 +1100 |
| commit | 8e5f5e3f05f9d2cd6ef1553deacce88c2a8c4d2e (patch) | |
| tree | b43e4182c8a5800e37e56a065ff1d3df79662411 /source4/setup | |
| parent | 55d2cec6402ca9568d13190c9a2049a251d2a846 (diff) | |
| download | samba-8e5f5e3f05f9d2cd6ef1553deacce88c2a8c4d2e.tar.gz samba-8e5f5e3f05f9d2cd6ef1553deacce88c2a8c4d2e.tar.bz2 samba-8e5f5e3f05f9d2cd6ef1553deacce88c2a8c4d2e.zip | |
s4:provision - Removed dependency on full Samba 3 schema from FDS
Diffstat (limited to 'source4/setup')
| -rw-r--r-- | source4/setup/fedorads-dna.ldif | 1 | ||||
| -rw-r--r-- | source4/setup/fedorads.inf | 5 | ||||
| -rw-r--r-- | source4/setup/schema-map-fedora-ds-1.0 | 47 |
3 files changed, 14 insertions, 39 deletions
diff --git a/source4/setup/fedorads-dna.ldif b/source4/setup/fedorads-dna.ldif index f9785f3364..646fec89b3 100644 --- a/source4/setup/fedorads-dna.ldif +++ b/source4/setup/fedorads-dna.ldif @@ -3,7 +3,6 @@ objectClass: top objectClass: extensibleObject cn: Samba SIDs dnaType: sambaSID -dnaMaxValue: 10000 dnaMagicRegen: 0 dnaFilter: (|(objectClass=user)(objectClass=group)) dnaScope: ${DOMAINDN} diff --git a/source4/setup/fedorads.inf b/source4/setup/fedorads.inf index e93913c70f..2dda1bc9d6 100644 --- a/source4/setup/fedorads.inf +++ b/source4/setup/fedorads.inf @@ -26,11 +26,6 @@ cert_dir= ${LDAPDIR}/slapd-samba4 start_server= 0 install_full_schema= 0 SchemaFile=${LDAPDIR}/99_ad.ldif -SchemaFile=/etc/dirsrv/schema/10rfc2307.ldif -SchemaFile=/etc/dirsrv/schema/05rfc4523.ldif -SchemaFile=/etc/dirsrv/schema/05rfc4524.ldif -SchemaFile=/etc/dirsrv/schema/06inetorgperson.ldif -SchemaFile=/usr/share/dirsrv/data/60samba3.ldif ConfigFile = ${LDAPDIR}/fedorads-partitions.ldif ConfigFile = ${LDAPDIR}/fedorads-sasl.ldif ConfigFile = ${LDAPDIR}/fedorads-dna.ldif diff --git a/source4/setup/schema-map-fedora-ds-1.0 b/source4/setup/schema-map-fedora-ds-1.0 index 7bb3da3300..4ed833fa33 100644 --- a/source4/setup/schema-map-fedora-ds-1.0 +++ b/source4/setup/schema-map-fedora-ds-1.0 @@ -12,17 +12,23 @@ description cn dITContentRules top -homePostalAddress -info -displayName -employeeNumber -employeeType -personalTitle -co -userSMIMECertificate + #This should be provided by the LDAP server, only in our schema to permit provision aci + #Skip ObjectClasses +sambaSamAccount +sambaGroupMapping +sambaTrustPassword +sambaTrustedDomainPassword +sambaDomain +sambaUnixIdPool +sambaIdmapEntry +sambaSidEntry +sambaConfig +sambaShare +sambaConfigOption + #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 @@ -47,8 +53,6 @@ aci 1.3.6.1.4.1.1466.115.121.1.43:1.3.6.1.4.1.1466.115.121.1.15 #Remap into existing schema -unixHomeDirectory -unixHomeDirectory:homeDirectory pwdLastSet pwdLastSet:sambaPwdLastSet lastLogon @@ -77,26 +81,3 @@ privilegeDisplayName privilegeDisplayName:sambaPrivName objectSid objectSid:sambaSID - -#Resolve conflicting attributes -1.2.840.113556.1.4.484:fRSDirectoryFilter-oid -1.2.840.113556.1.4.483:fRSFileFilter-oid -1.2.840.113556.1.4.485:fRSUpdateTimeout-oid -2.16.840.1.113730.3.1.36:thumbnailLogo-oid -2.16.840.1.113730.3.1.35:thumbnailPhoto-oid -1.2.840.113556.1.4.481:schemaUpdate-oid - -#Resolve conflicting object classes -domain:samba4Domain -rFC822LocalPart:samba4RFC822LocalPart -mailRecipient:samba4MailRecipient -nisMap:samba4NisMap -0.9.2342.19200300.100.4.14:samba4RFC822LocalPart-oid -person:samba4Person -2.5.6.6:samba4Person-oid -organizationalPerson:samba4OrganizationalPerson -2.5.6.7:samba4OrganizationalPerson-oid -residentialPerson:samba4ResidentialPerson -2.5.6.10:samba4ResidentialPerson-oid -inetOrgPerson:samba4InetOrgPerson -2.16.840.1.113730.3.2.2:samba4InetOrgPerson-oid |