diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2009-10-23 20:09:07 -0500 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-11-02 16:36:53 +1100 |
| commit | 8097280b468b7bcf26a0e17fdcaaccfb34d06415 (patch) | |
| tree | ce7ceb937a32e4e18b3507caafd0b9f322ba7026 /source4/setup | |
| parent | 1fc19ee7d0021e963923911bb440463aa79184fc (diff) | |
| download | samba-8097280b468b7bcf26a0e17fdcaaccfb34d06415.tar.gz samba-8097280b468b7bcf26a0e17fdcaaccfb34d06415.tar.bz2 samba-8097280b468b7bcf26a0e17fdcaaccfb34d06415.zip | |
s4 - Mapped AD schema to existing FDS schema.
Diffstat (limited to 'source4/setup')
| -rw-r--r-- | source4/setup/fedorads-samba.ldif | 1 | ||||
| -rw-r--r-- | source4/setup/fedorads.inf | 5 | ||||
| -rw-r--r-- | source4/setup/schema-map-fedora-ds-1.0 | 63 |
3 files changed, 68 insertions, 1 deletions
diff --git a/source4/setup/fedorads-samba.ldif b/source4/setup/fedorads-samba.ldif index 2d77adac09..cc0faf29ed 100644 --- a/source4/setup/fedorads-samba.ldif +++ b/source4/setup/fedorads-samba.ldif @@ -7,4 +7,5 @@ dn: CN=samba-admin,${SAMBADN} objectClass: top objectClass: person cn: samba-admin +sn: samba-admin userPassword: {CLEAR}${LDAPADMINPASS} diff --git a/source4/setup/fedorads.inf b/source4/setup/fedorads.inf index e0676c41df..9653f50325 100644 --- a/source4/setup/fedorads.inf +++ b/source4/setup/fedorads.inf @@ -26,6 +26,11 @@ 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-pam.ldif diff --git a/source4/setup/schema-map-fedora-ds-1.0 b/source4/setup/schema-map-fedora-ds-1.0 index aac585b514..9298f382cb 100644 --- a/source4/setup/schema-map-fedora-ds-1.0 +++ b/source4/setup/schema-map-fedora-ds-1.0 @@ -1,4 +1,4 @@ -#Standard OpenLDAP attributes +#Standard Fedora DS attributes name objectClasses createTimeStamp @@ -12,6 +12,14 @@ 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 @@ -37,3 +45,56 @@ aci 1.2.840.113556.1.4.904:1.3.6.1.4.1.1466.115.121.1.15 #Presentation Address as Directory String 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 +lastLogon:sambaLogonTime +lastLogoff +lastLogoff:sambaLogoffTime +badPwdCount +badPwdCount:sambaBadPasswordCount +logonHours +logonHours:sambaLogonHours +homeDrive +homeDrive:sambaHomeDrive +scriptPath +scriptPath:sambaLogonScript +profilePath +profilePath:sambaProfilePath +userWorkstations +userWorkstations:sambaUserWorkstations +homeDirectory +homeDirectory:sambaHomePath +groupType +groupType:sambaGroupType +nextRid +nextRid:sambaNextRid +privilegeDisplayName +privilegeDisplayName:sambaPrivName + +#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 |