From: Quanah Gibson-Mount Date: Tue, 20 Nov 2007 19:44:53 +0000 (+0000) Subject: ITS#5236 X-Git-Tag: OPENLDAP_REL_ENG_2_4_7~67 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3e461b8ee2433ab043a655c1fa0d2293d75454e7;p=openldap ITS#5236 --- diff --git a/CHANGES b/CHANGES index 9e2c139475..ac850033f4 100644 --- a/CHANGES +++ b/CHANGES @@ -8,6 +8,7 @@ OpenLDAP 2.4.7 Engineering Fixed slapd contextCSN updating from old releases (ITS#5225) Fixed slapd paged results handling when using rootdn (ITS#5230) Fixed slapd syncrepl presentlist handling (ITS#5231) + Fixed slapd core schema 'c' definition for RFC4519 (ITS#5236) Fixed slapo-ppolicy single password check on modify (ITS#5146) Fixed slapo-syncprov refresh and persist cookie sending (ITS#5210) Fixed slapo-syncprov ignore invalid cookies (ITS#5211) 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 )