ITS#955: update cosine schema based upon X.500 recommendations

servers/slapd/schema/cosine.schema

@@ -1155,20 +1155,18 @@ objectclass ( 0.9.2342.19200300.100.4.9 NAME 'documentSeries'
 #            organizationalAttributeSet}
 #    ::= {pilotObjectClass 13}
 #
-## from RFC 2247, we presume that organizationalAttributeSet
-## should be expanded as below.
 objectclass ( 0.9.2342.19200300.100.4.13 NAME 'domain'
 	SUP top STRUCTURAL
 	MUST domainComponent
-	MAY ( userPassword $ searchGuide $ seeAlso $
-		businessCategory $ x121Address $ registeredAddress $
-		destinationIndicator $ preferredDeliveryMethod $
-		telexNumber $ teletexTerminalIdentifier $  
-		telephoneNumber $ internationaliSDNNumber $
-		facsimileTelephoneNumber $ street $ postOfficeBox $
-		postalCode $ postalAddress $
-		physicalDeliveryOfficeName $
-		stateOrProvinceName $ localityName $ description )
+	MAY ( associatedName $ organizationName $ description $
+		businessCategory $ seeAlso $ searchGuide $ userPassword $
+		localityName $ stateOrProvinceName $ streetAddress $
+		physicalDeliveryOfficeName $ postalAddress $ postalCode $
+		postOfficeBox $ streetAddress $
+		facsimileTelephoneNumber $ internationalISDNNumber $
+		telephoneNumber $ teletexTerminalIdentifier $ telexNumber $
+		preferredDeliveryMethod $ destinationIndicator $
+		registeredAddress $ x121Address )
 	)
 
 # 8.3.8.  RFC822 Local Part
@@ -1190,11 +1188,15 @@ objectclass ( 0.9.2342.19200300.100.4.13 NAME 'domain'
 #            telecommunicationAttributeSet}
 #    ::= {pilotObjectClass 14}
 #
-## not sure what to expand postalAttributeSet and
-## telecommunitionAttributeSet to, so they are trimmed
 objectclass ( 0.9.2342.19200300.100.4.14 NAME 'RFC822localPart'
 	SUP domain STRUCTURAL
-	MAY ( commonName $ surname $ description $ seeAlso $ telephonenumber )
+	MAY ( commonName $ surname $ description $ seeAlso $ telephonenumber $
+		physicalDeliveryOfficeName $ postalAddress $ postalCode $
+		postOfficeBox $ streetAddress $
+		facsimileTelephoneNumber $ internationalISDNNumber $
+		telephoneNumber $ teletexTerminalIdentifier $
+		telexNumber $ preferredDeliveryMethod $ destinationIndicator $
+		registeredAddress $ x121Address )
 	)
 
 # 8.3.9.  DNS Domain