--- a/hsm.schema	Tue Jul 19 16:36:46 2005 +0000
+++ b/hsm.schema	Thu Jul 21 12:21:36 2005 +0000
@@ -62,9 +62,19 @@
 
 attributetype (
     hsmAttribute:10 NAME 'hsmNID' DESC 'employee / student / guest number'
-    SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
-)
+    SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
 
+attributetype (
+    hsmAttribute:11 NAME 'hsmMailHost' DESC 'SMTP/MTA for that recipient'
+    EQUALITY caseIgnoreIA5Match
+    SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
+    SINGLE-VALUE )
+
+attributetype (
+    hsmAttribute:12 NAME 'hsmMailForwardingAddress' DESC 'forwarding information for this recipient'
+    EQUALITY caseIgnoreIA5Match
+    SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
+    SINGLE-VALUE )
 
 ####
 
@@ -72,23 +82,23 @@
     hsmObjectClass:1  NAME 'hsmNaturalPerson' DESC 'natural person representation'
     SUP top
     AUXILIARY
-    MUST ( hsmGender )
     MAY ( hsmInitialPassword 
+	$ hsmGender
 	$ hsmNID
 	$ hsmDateOfBirth $ hsmPlaceOfBirth 
-	$ hsmDateCreated $ hsmDateDeleted ) )
+	$ hsmDateOfCreation $ hsmDateOfDeletion ) )
 
 objectClass (
     hsmObjectClass:2 NAME 'hsmMailReject' DESC 'mail reject cause'
     SUP top
     STRUCTURAL
-    MUST ( rfc822MailBox $ hsmDateCreated $ hsmMailRejectText ) )
+    MUST ( rfc822MailBox $ hsmDateOfCreation $ hsmMailRejectText ) )
 
 
 objectClass (
     hsmObjectClass:3 NAME 'hsmMailRecipient' DESC 'mail attributes associated to person'
     SUP top
-    MAY ( hsmMailPrimaryAddress $ mail $ mailHost $ mailRoutingAddress ) )
+    MAY ( hsmMailPrimaryAddress $ mail $ hsmMailHost $ hsmMailForwardingAddress ) )
 
 
 # vim:sts=4 sw=4 aw ai sm: