Import nisSchema support

diff --git a/servers/slapd/schema/nis.schema b/servers/slapd/schema/nis.schema
index 3039d887e3208f83ce844999cba3c238013b2115..68f19f01d5d64b11198fc88699e170164383e226 100644 (file)
--- a/servers/slapd/schema/nis.schema
+++ b/servers/slapd/schema/nis.schema
@@ -1,5 +1,6 @@
 # $OpenLDAP$
-# Definitions from RFC2307
+# Definitions from RFC2307 (Experimental)
+#      An Approach for Using LDAP as a Network Information Service
 
 # Note: The definitions in RFC2307 are given in syntaxes closely related
 # to those in RFC2252, however, some liberties are taken that are not
@@ -10,6 +11,9 @@
 # i.e. nisSchema in RFC2307 is 1.3.6.1.1.1
 #
 # Syntaxes are under 1.3.6.1.1.1.0 (two new syntaxes are defined)
+#      validaters for these syntaxes are incomplete, they only
+#      implement printable string validation (which is good as the
+#      common use of these syntaxes violates the specification).
 # Attribute types are under 1.3.6.1.1.1.1
 # Object classes are under 1.3.6.1.1.1.2
 

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 6c14e783c3ba0f1e9c64b462ea1068536beb618d..4e7a570528deb5fbbe2d91d28d8feeae5add196d 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -19,6 +19,8 @@
 
 /* recycled validatation routines */
 #define berValidate                                            blobValidate
+#define nisNetgroupTripleValidate              printableStringValidate
+#define bootParameterValidate                  printableStringValidate
 
 /* unimplemented validators */
 #define bitStringValidate                              NULL
@@ -2292,6 +2294,12 @@ struct syntax_defs_rec syntax_defs[] = {
        {"( 1.3.6.1.4.1.1466.115.121.1.58 DESC 'Substring Assertion' )",
                0, NULL, NULL, NULL},
 
+       /* RFC 2307 NIS Syntaxes */
+       {"( 1.3.6.1.1.1.0.0  DESC 'RFC2307 NIS Triple' )",
+               0, nisNetgroupTripleValidate, NULL, NULL},
+       {"( 1.3.6.1.1.1.0.1  DESC 'RFC2307 Boot Parameter' )",
+               0, bootParameterValidate, NULL, NULL},
+
        /* OpenLDAP Experimental Syntaxes */
        {"( 1.3.6.1.4.1.4203.666.2.1 DESC 'OpenLDAP Experimental ACI' )",
                0, IA5StringValidate /* THIS WILL CHANGE FOR NEW ACI SYNTAX */, NULL, NULL},