--- a/hsm.schema	Tue Jul 19 13:30:10 2005 +0000
+++ b/hsm.schema	Tue Jul 19 16:36:46 2005 +0000
@@ -34,29 +34,36 @@
     SINGLE-VALUE )
 
 attributetype (
-    hsmAttribute:5 NAME 'hsmDateCreated' DESC 'Date of Creation'
+    hsmAttribute:5 NAME 'hsmDateOfCreation' DESC 'Date of Creation'
     EQUALITY generalizedTimeMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 
     SINGLE-VALUE )
 
 attributetype (
-    hsmAttribute:6 NAME 'hsmDateDeleted' DESC 'Date of deletion'
+    hsmAttribute:6 NAME 'hsmDateOfDeletion' DESC 'Date of deletion'
     EQUALITY generalizedTimeMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 
     SINGLE-VALUE )
 
 attributetype (
-    hsmAttribute:7 NAME 'hsmMailRejectText' DESC 'text for mail rejection'
+    hsmAttribute:7 NAME 'hsmDateOfExpiration' DESC 'supposed date of expiration'
+    EQUALITY generalizedTimeMatch
+    SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 
+    SINGLE-VALUE )
+
+attributetype (
+    hsmAttribute:8 NAME 'hsmMailRejectText' DESC 'text for mail rejection'
     SUP info )
 
 attributetype (
-    hsmAttribute:8 NAME 'hsmMailPrimaryAddress' DESC 'primary mail address'
+    hsmAttribute:9 NAME 'hsmMailPrimaryAddress' DESC 'primary mail address'
     SUP mail
     SINGLE-VALUE )
 
 attributetype (
-    hsmAttribute:9 NAME 'hsmMailAcceptAddress' DESC 'acceptable mail address'
-    SUP mail )
+    hsmAttribute:10 NAME 'hsmNID' DESC 'employee / student / guest number'
+    SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+)
 
 
 ####
@@ -67,6 +74,7 @@
     AUXILIARY
     MUST ( hsmGender )
     MAY ( hsmInitialPassword 
+	$ hsmNID
 	$ hsmDateOfBirth $ hsmPlaceOfBirth 
 	$ hsmDateCreated $ hsmDateDeleted ) )
 
@@ -78,9 +86,9 @@
 
 
 objectClass (
-    hsmObjectClass:3 NAME 'hsmMailObject' DESC 'mail attributes associated to person'
+    hsmObjectClass:3 NAME 'hsmMailRecipient' DESC 'mail attributes associated to person'
     SUP top
-    MAY ( hsmMailPrimaryAddress $ hsmMailAcceptAddress ) )
+    MAY ( hsmMailPrimaryAddress $ mail $ mailHost $ mailRoutingAddress ) )
 
 
 # vim:sts=4 sw=4 aw ai sm: