Move schema needed by slapd to core.schema so that only one file

is required to be included.
This leaves openldap.schema empty.  Will use it to hold example
schema from the OpenLDAP Public Directory.

servers/slapd/schema/core.schema

@@ -558,7 +558,7 @@ objectclass ( 1.3.6.1.1.3.1 NAME 'uidObject'
 #	used to represent referrals in the directory
 #
 attributetype ( 2.16.840.1.113730.3.1.34 NAME 'ref'
-	DESC 'nameref URL Reference'
+	DESC 'Named referral'
 	EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
 	USAGE distributedOperation )
 
@@ -581,3 +581,55 @@ objectclass ( 1.3.6.1.4.1.4203.666.3.2
 	DESC 'OpenLDAP Root DSE object'
 	SUP top STRUCTURAL MAY cn )
 
+
+#
+# From U-Mich
+#
+attributetype ( 1.3.6.1.4.1.250.1.32
+	NAME ( 'krbName' 'kerberosName' )
+	DESC 'Kerberos Name'
+	EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+	SINGLE-VALUE )
+
+
+#
+# OpenLDAP specific schema items
+#
+attributetype ( 1.3.6.1.4.1.4203.666.1.1
+	NAME 'authPassword'
+	DESC 'OpenLDAP authPassword attribute'
+	EQUALITY authPasswordMatch
+	SYNTAX 1.3.6.1.4.1.4203.666.2.2
+	USAGE dSAOperation )
+
+attributetype ( 1.3.6.1.4.1.4203.666.1.2
+	NAME 'supportedAuthPasswordSchemes'
+	DESC 'OpenLDAP authPassword attribute'
+	EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32}
+	NO-USER-MODIFICATION USAGE dSAOperation )
+
+attributetype ( 1.3.6.1.4.1.4203.666.1.3
+	NAME 'entry'
+	DESC 'OpenLDAP ACL entry psuedo attribute'
+	SYNTAX 1.3.6.1.4.1.4203.666.2.3
+	SINGLE-VALUE NO-USER-MODIFICATION USAGE dSAOperation )
+
+attributetype ( 1.3.6.1.4.1.4203.666.1.4
+	NAME 'children'
+	DESC 'OpenLDAP ACL children psuedo attribute'
+	SYNTAX 1.3.6.1.4.1.4203.666.2.3
+	SINGLE-VALUE NO-USER-MODIFICATION USAGE dSAOperation )
+
+attributetype ( 1.3.6.1.4.1.4203.666.1.5
+	NAME 'OpenLDAPaci'
+	DESC 'OpenLDAP access control information'
+	EQUALITY OpenLDAPaciMatch
+	SYNTAX 1.3.6.1.4.1.4203.666.2.1
+	USAGE directoryOperation )
+
+objectclass ( 1.3.6.1.4.1.4203.666.3.1 NAME 'authPasswordObject'
+	DESC 'authentication password mixin class'
+	MAY authPassword
+	AUXILIARY )

servers/slapd/schema/openldap.schema

 # $OpenLDAP$
 #
-# This file contains schema items specific to OpenLDAP software.
+# OpenLDAP Project's directory schema items
 #
-
-#
-# This file *should* only depend upon core.schema
-#
-
-# 
-# slapd cn=monitor items
-#
-
-# 
-# slapd cn=config items
-#
-
-#
-# other slapd items
-#
-attributetype ( 1.3.6.1.4.1.4203.666.1.1 NAME 'authPassword'
-	DESC 'OpenLDAP authPassword attribute'
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.40
-	SINGLE-VALUE NO-USER-MODIFICATION USAGE dSAOperation )
-
-attributetype ( 1.3.6.1.4.1.4203.666.1.3 NAME 'entry'
-	DESC 'OpenLDAP ACL entry psuedo attribute'
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.5
-	SINGLE-VALUE NO-USER-MODIFICATION USAGE dSAOperation )
-
-attributetype ( 1.3.6.1.4.1.4203.666.1.4 NAME 'children'
-	DESC 'OpenLDAP ACL children psuedo attribute'
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.5
-	SINGLE-VALUE NO-USER-MODIFICATION USAGE dSAOperation )
-
-attributetype ( 1.3.6.1.4.1.4203.666.1.5 NAME 'OpenLDAPaci'
-	DESC 'OpenLDAP access control information'
-	EQUALITY OpenLDAPaciMatch
-	SYNTAX 1.3.6.1.4.1.4203.666.2.1
-	USAGE directoryOperation )
-
-#
-# From U-Mich
-#
-attributetype ( 1.3.6.1.4.1.250.1.32
-	NAME ( 'krbName' 'kerberosName' )
-	DESC 'Kerberos Name'
-	EQUALITY caseIgnoreIA5Match
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-	SINGLE-VALUE )