From fae8625a494d3538861f542963d28665a8deb470 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Mon, 3 Sep 2007 00:43:47 +0000 Subject: [PATCH] IA5String stuff from HEAD --- servers/slapd/back-bdb/config.c | 2 +- servers/slapd/bconfig.c | 1 + servers/slapd/schema_init.c | 5 ++--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/servers/slapd/back-bdb/config.c b/servers/slapd/back-bdb/config.c index 303035d391..b21087a223 100644 --- 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 79b99d1fec..022b0850e6 100644 --- 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 7d0114a795..082833e475 100644 --- 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. -------------------------------------------------------------------*/ -- 2.39.5