From 50bb5cc14e1f7caf0d2e4f9aff771868d9eedc9e Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Fri, 27 Jan 2012 11:45:55 -0700 Subject: [PATCH] Ticket #22 - RFE: Support sendmail LDAP routing schema https://fedorahosted.org/389/ticket/22 Resolves: Ticket #22 Bug Description: RFE: Support sendmail LDAP routing schema Reviewed by: ??? Branch: master Fix Description: First I had to fix the OID for ntGroupType. I assigned a new OID to it from our OID range. Next, I added a new file 60sendmail.ldif containing the new sendmail schema. This must be in a separate file. The problem is that the new schema is incompatible with the existing schema of the same name - different syntaxes and matching rules. So if you use 60sendmail.ldif, you must not use 50ns-mail.ldif, 60inetmail.ldif, or 60qmail.ldif. Platforms tested: RHEL6 x86_64 Flag Day: no Doc impact: no --- Makefile.am | 1 + Makefile.in | 1 + ldap/schema/50ns-directory.ldif | 2 +- ldap/schema/60sendmail.ldif | 54 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 1 deletions(-) create mode 100644 ldap/schema/60sendmail.ldif diff --git a/Makefile.am b/Makefile.am index 045c986..e84b63d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -266,6 +266,7 @@ sampledata_DATA = ldap/admin/src/scripts/failedbinds.py \ $(srcdir)/ldap/schema/60rfc4876.ldif \ $(srcdir)/ldap/schema/60samba.ldif \ $(srcdir)/ldap/schema/60samba3.ldif \ + $(srcdir)/ldap/schema/60sendmail.ldif \ $(LIBPRESENCE_SCHEMA) schema_DATA = $(srcdir)/ldap/schema/00core.ldif \ diff --git a/Makefile.in b/Makefile.in index b1d5c68..b33c6a5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1469,6 +1469,7 @@ sampledata_DATA = ldap/admin/src/scripts/failedbinds.py \ $(srcdir)/ldap/schema/60rfc4876.ldif \ $(srcdir)/ldap/schema/60samba.ldif \ $(srcdir)/ldap/schema/60samba3.ldif \ + $(srcdir)/ldap/schema/60sendmail.ldif \ $(LIBPRESENCE_SCHEMA) schema_DATA = $(srcdir)/ldap/schema/00core.ldif \ diff --git a/ldap/schema/50ns-directory.ldif b/ldap/schema/50ns-directory.ldif index 1c7ae35..1e31dca 100644 --- a/ldap/schema/50ns-directory.ldif +++ b/ldap/schema/50ns-directory.ldif @@ -78,7 +78,7 @@ attributeTypes: ( 2.16.840.1.113730.3.1.43 NAME 'ntUserDeleteAccount' DESC 'Nets attributeTypes: ( 2.16.840.1.113730.3.1.44 NAME 'ntGroupDomainId' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape NT Synchronization' ) attributeTypes: ( 2.16.840.1.113730.3.1.45 NAME 'ntGroupCreateNewGroup' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape NT Synchronization' ) attributeTypes: ( 2.16.840.1.113730.3.1.46 NAME 'ntGroupDeleteGroup' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape NT Synchronization' ) -attributeTypes: ( 2.16.840.1.113730.3.1.47 NAME 'ntGroupType' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape NT Synchronization' ) +attributeTypes: ( 2.16.840.1.113730.3.1.2112 NAME 'ntGroupType' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape NT Synchronization' ) attributeTypes: ( 2.16.840.1.113730.3.1.59 NAME 'ntUserPriv' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 SINGLE-VALUE X-ORIGIN 'Netscape NT Synchronization' ) attributeTypes: ( 2.16.840.1.113730.3.1.60 NAME 'ntUserAuthFlags' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 SINGLE-VALUE X-ORIGIN 'Netscape NT Synchronization' ) attributeTypes: ( 2.16.840.1.113730.3.1.61 NAME 'ntUserUsrComment' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape NT Synchronization' ) diff --git a/ldap/schema/60sendmail.ldif b/ldap/schema/60sendmail.ldif new file mode 100644 index 0000000..1d746d7 --- /dev/null +++ b/ldap/schema/60sendmail.ldif @@ -0,0 +1,54 @@ +# +################################################################################ +# +dn: cn=schema +# +################################################################################ +# +attributeTypes: ( + 2.16.840.1.113730.3.1.13 + NAME 'mailLocalAddress' + DESC 'RFC822 email address of this recipient' + EQUALITY caseIgnoreIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + X-ORIGIN 'draft-lachman-laser-ldap-mail-routing-02.txt' + ) +# +################################################################################ +# +attributeTypes: ( + 2.16.840.1.113730.3.1.18 + NAME 'mailHost' + DESC 'FQDN of the SMTP/MTA of this recipient' + EQUALITY caseIgnoreIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE + X-ORIGIN 'draft-lachman-laser-ldap-mail-routing-02.txt' + ) +# +################################################################################ +# +attributeTypes: ( + 2.16.840.1.113730.3.1.47 + NAME 'mailRoutingAddress' + DESC 'RFC822 routing address of this recipient' + EQUALITY caseIgnoreIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE + X-ORIGIN 'draft-lachman-laser-ldap-mail-routing-02.txt' + ) +# +################################################################################ +# +objectClasses: ( + 2.16.840.1.113730.3.2.147 + NAME 'inetLocalMailRecipient' + DESC 'Internet local mail recipient' + SUP top + AUXILIARY + MAY ( mailLocalAddress $ mailHost $ mailRoutingAddress ) + X-ORIGIN 'draft-lachman-laser-ldap-mail-routing-02.txt' + ) +# +################################################################################ +# -- 1.7.1