Schema cleanup (and testing)

diff --git a/servers/slapd/schema/collective.schema b/servers/slapd/schema/collective.schema
index 2b85761e0e37f6f5c27640fe8de1faff5a809243..8085ac372f8126fb0363f41f94e2a5e5425e4053 100644 (file)
--- a/servers/slapd/schema/collective.schema
+++ b/servers/slapd/schema/collective.schema
@@ -13,7 +13,7 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 #
-## Portions Copyright (C) The Internet Society (2003).  All Rights Reserved.
+## Portions Copyright (C) The Internet Society (2003).
 ## Please see full copyright statement below.
 
 # From RFC 3671 [portions trimmed]:

diff --git a/servers/slapd/schema/corba.schema b/servers/slapd/schema/corba.schema
index 8dcf3e3d620e62b86d75f416e6ed96eaca9391e8..6cf26f22f3834e84dc1bedf1554a9e929c3f5a4a 100644 (file)
--- a/servers/slapd/schema/corba.schema
+++ b/servers/slapd/schema/corba.schema
@@ -15,7 +15,7 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 #
-## Portions Copyright (C) The Internet Society (1999).  All Rights Reserved.
+## Portions Copyright (C) The Internet Society (1999).
 ## Please see full copyright statement below.
 
 

diff --git a/servers/slapd/schema/ppolicy.schema b/servers/slapd/schema/ppolicy.schema
index 8368e44890d9217b5622a058876a3466e6c2fd81..183dca5754aa880132b0910727aba603c7f0eaaa 100644 (file)
--- a/servers/slapd/schema/ppolicy.schema
+++ b/servers/slapd/schema/ppolicy.schema
@@ -12,7 +12,7 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 #
-## Portions Copyright (C) The Internet Society (2004).  All Rights Reserved.
+## Portions Copyright (C) The Internet Society (2004).
 ## Please see full copyright statement below.
 
 # Definitions from Draft behera-ldap-password-policy-07 (a work in progress)

diff --git a/tests/data/slapd-schema.conf b/tests/data/slapd-schema.conf
index 976f4d0091f0975a0503483240c65cb3f3341efe..d1f82f617718027ed08224542963706cb3b5c43c 100644 (file)
--- a/tests/data/slapd-schema.conf
+++ b/tests/data/slapd-schema.conf
@@ -24,6 +24,11 @@ include ./schema/inetorgperson.schema
 include ./schema/misc.schema
 include ./schema/nis.schema
 include ./schema/openldap.schema
+#
+include ./schema/duaconf.schema
+include ./schema/dyngroup.schema
+include ./schema/ppolicy.schema
+
 #
 pidfile     ./testrun/slapd.1.pid
 argsfile    ./testrun/slapd.1.args