Partially revert prev commit, leave rs->sr_err == SLAPD_ABANDON

[openldap] / servers / slapd / schema / core.schema

diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema
index fd75166d4d6a73dcb158266678f89a4fd9772cac..4acf6593b11aa9fd3f86edfdb73541f7b9b13f87 100644 (file)
--- a/servers/slapd/schema/core.schema
+++ b/servers/slapd/schema/core.schema
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2007 The OpenLDAP Foundation.
+## Copyright 1998-2009 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -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).
-#
-attributetype ( 2.5.4.6 NAME 'c'
-       DESC 'RFC2256: ISO-3166 country 2-letter code'
+# RFC 4519 definition ('countryName' in X.500 and RFC2256)
+attributetype ( 2.5.4.6 NAME ( 'c' 'countryName' )
+       DESC 'RFC4519: two-letter ISO-3166 country code'
        SUP name
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.11
        SINGLE-VALUE )