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

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

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