From: Pierangelo Masarati Date: Sat, 17 Nov 2007 13:50:49 +0000 (+0000) Subject: sync 'c' with RFC4519 (ITS#5236) X-Git-Tag: OPENLDAP_REL_ENG_2_4_9~20^2~426 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=16460ccbde3b6a34c328d3158791de889156e22d;p=openldap sync 'c' with RFC4519 (ITS#5236) --- diff --git a/servers/slapd/schema/core.ldif b/servers/slapd/schema/core.ldif index f82aac80d7..940af113eb 100644 --- a/servers/slapd/schema/core.ldif +++ b/servers/slapd/schema/core.ldif @@ -94,9 +94,12 @@ olcAttributeTypes: ( 2.5.4.5 NAME 'serialNumber' SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.44{64} ) # -olcAttributeTypes: ( 2.5.4.6 NAME ( 'c' 'countryName' ) - DESC 'RFC2256: ISO-3166 country 2-letter code' - SUP name SINGLE-VALUE ) +# RFC 4519 definition ('countryName' in X.500 and RFC2256) +olcAttributeTypes: ( 2.5.4.6 NAME 'c' + DESC 'RFC4519: two-letter ISO-3166 country code' + SUP name + SYNTAX 1.3.6.1.4.1.1466.115.121.1.11 + SINGLE-VALUE ) # olcAttributeTypes: ( 2.5.4.7 NAME ( 'l' 'localityName' ) DESC 'RFC2256: locality which this object resides in' diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema index fd75166d4d..ce072c6a15 100644 --- a/servers/slapd/schema/core.schema +++ b/servers/slapd/schema/core.schema @@ -92,11 +92,9 @@ attributetype ( 2.5.4.5 NAME 'serialNumber' SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.44{64} ) -# RFC 4519 definition (cannot be loaded because SYNTAX conflicts -# with that of name). -# +# RFC 4519 definition ('countryName' in X.500 and RFC2256) attributetype ( 2.5.4.6 NAME 'c' - DESC 'RFC2256: ISO-3166 country 2-letter code' + DESC 'RFC4519: two-letter ISO-3166 country code' SUP name SYNTAX 1.3.6.1.4.1.1466.115.121.1.11 SINGLE-VALUE )