IA5String stuff from HEAD

diff --git a/servers/slapd/back-bdb/config.c b/servers/slapd/back-bdb/config.c
index 303035d3919566ee3327e80f427f93e03af84070..b21087a22354e909d86dc9c7e996fd660cfb52e5 100644 (file)
--- a/servers/slapd/back-bdb/config.c
+++ b/servers/slapd/back-bdb/config.c
@@ -72,7 +72,7 @@ static ConfigTable bdbcfg[] = {
        { "dbconfig", "DB_CONFIG setting", 1, 0, 0, ARG_MAGIC|BDB_CONFIG,
                bdb_cf_gen, "( OLcfgDbAt:1.3 NAME 'olcDbConfig' "
                        "DESC 'BerkeleyDB DB_CONFIG configuration directives' "
-                       "SYNTAX OMsDirectoryString X-ORDERED 'VALUES' )", NULL, NULL },
+                       "SYNTAX OMsIA5String X-ORDERED 'VALUES' )", NULL, NULL },
        { "dbnosync", NULL, 1, 2, 0, ARG_ON_OFF|ARG_MAGIC|BDB_NOSYNC,
                bdb_cf_gen, "( OLcfgDbAt:1.4 NAME 'olcDbNoSync' "
                        "DESC 'Disable synchronous database writes' "

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 79b99d1fec32cde3da176ac389333daf91bf9a7a..022b0850e6dcea21fbeebdd61603302907e7bd35 100644 (file)
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -208,6 +208,7 @@ static OidRec OidMacros[] = {
        { "OMsBoolean", "OMsyn:7" },
        { "OMsDN", "OMsyn:12" },
        { "OMsDirectoryString", "OMsyn:15" },
+       { "OMsIA5String", "OMsyn:26" },
        { "OMsInteger", "OMsyn:27" },
        { "OMsOID", "OMsyn:38" },
        { "OMsOctetString", "OMsyn:40" },

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 7d0114a795b32dd679ec0045770892c663901181..082833e47575cc6bed5d9f5c9c4757056648eb3f 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -1446,12 +1446,11 @@ PrintableString
   In ASN.1, Printable string is just a string of printable characters
   and can be empty.  In X.500, semantics much like NumericString (see
   serialNumber for a like example) excepting uses insignificant space
-  handling instead of ignore all spaces.  
+  handling instead of ignore all spaces.  They must be non-empty.
 
 IA5String
   Basically same as PrintableString.  There are no examples in X.500,
-  but same logic applies.  So we require them to be non-empty as
-  well.
+  but same logic applies.  Empty strings are allowed.
 
 -------------------------------------------------------------------*/