Use DN syntax routines for Name and Optional OID syntax.

This is quite bogus but meets most users needs.
Should be replaced with real Name and Optional OID routines.

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index cac0f0b0a337f04d8d7bee66d89a69c5ae4015a8..1e5bac4ae25b9fd5a4f23a1f5d539bb9b8fb4b56 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -19,6 +19,7 @@
 
 /* recycled validatation routines */
 #define berValidate                                            blobValidate
+#define nameUIDValidate                                        dnValidate
 
 /* unimplemented validators */
 #define bitStringValidate                              NULL
@@ -28,6 +29,7 @@
 #define phoneNumberNormalize                   numericStringNormalize
 #define telexNumberNormalize                   numericStringNormalize
 #define integerNormalize                               numericStringNormalize
+#define nameUIDNormalize                               dnNormalize
 
 /* unimplemented normalizers */
 #define bitStringNormalize                             NULL
@@ -36,6 +38,9 @@
 #define dnPretty                                               NULL
 #define integerPretty                                  NULL
 
+/* recyclied pretters */
+#define nameUIDPretty                                  dnPretty
+
 /* recycled matching routines */
 #define numericStringMatch                             caseIgnoreMatch
 #define objectIdentifierMatch                  numericStringMatch
@@ -3544,7 +3549,7 @@ struct syntax_defs_rec syntax_defs[] = {
        {"( 1.3.6.1.4.1.1466.115.121.1.33 DESC 'MHS OR Address' )",
                0, NULL, NULL, NULL},
        {"( 1.3.6.1.4.1.1466.115.121.1.34 DESC 'Name And Optional UID' )",
-               0, NULL, NULL, NULL},
+               0, nameUIDValidate, nameUIDNormalize, nameUIDPretty},
        {"( 1.3.6.1.4.1.1466.115.121.1.35 DESC 'Name Form Description' )",
                0, NULL, NULL, NULL},
        {"( 1.3.6.1.4.1.1466.115.121.1.36 DESC 'Numeric String' )",