--- a/cms.schema	Wed Jun 21 13:06:54 2006 +0000
+++ b/cms.schema	Tue Jul 04 15:17:29 2006 +0000
@@ -14,9 +14,11 @@
 objectIdentifier cmsObjectClass cmsRoot:2
 
 attributetype (
-    cmsAttribute:1 NAME 'cmsMailOfficialAddress' DESC 'official mail address'
-    SUP mail
-    SINGLE-VALUE )
+    cmsAttribute:1 NAME ('cmsMailPrimaryAddress' 'cmsMailOfficialAddress') DESC 'official mail address'
+    EQUALITY caseIgnoreIA5Match
+    SUBSTR caseIgnoreIA5SubstringsMatch
+    SINGLE-VALUE
+    SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 attributetype (
     cmsAttribute:2 NAME 'cmsMailForwardingAddress' DESC 'forwarding information for this recipient'
@@ -24,13 +26,27 @@
     SUBSTR caseIgnoreIA5SubstringsMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
+attributetype (
+    cmsAttribute:3 NAME ('cmsMailGroup') DESC 'mail group we are member of'
+    SUP mail )
+
+attributetype (
+    cmsAttribute:4 NAME ('cmsMailAddress') DESC 'mail address'
+    SUP mail )
+
 ####
 
 objectClass (
+    cmsObjectClass:2 NAME 'cmsMailAlias' DESC 'Alias'
+    SUP top
+    STRUCTURAL
+    MUST ( mail )
+    MAY ( cmsMailForwardingAddress $ description ) )
+
+objectClass (
     cmsObjectClass:3 NAME 'cmsMailRecipient' DESC 'mail attributes associated to person'
     SUP top
     AUXILIARY
-    MAY ( cmsMailOfficialAddress $ mail $ cmsMailForwardingAddress $ description ) )
-
+    MAY ( cmsMailPrimaryAddress $ cmsMailAddress $ cmsMailGroup $ cmsMailForwardingAddress $ description ) )
 
 # vim:sts=4 sw=4 aw ai sm: