From 9ec2849a6da0a75ef55fbff450609f89ba43e799 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Julio=20S=C3=A1nchez=20Fern=C3=A1ndez?= Date: Thu, 17 Jun 1999 13:11:30 +0000 Subject: [PATCH] Fix handling of SYNTAX_CES by making use of some matching rules in X.520 that were not inherited by RFC2252. Fill in properly the matching rule oids when converting an attribute type definition in the old format. --- servers/slapd/attr.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c index 3fcca89c7e..459ce3cccc 100644 --- a/servers/slapd/attr.c +++ b/servers/slapd/attr.c @@ -227,18 +227,22 @@ attr_syntax_config( strcasecmp( argv[lasti], "cis" ) == 0 ) { at->at_syntax_oid = "1.3.6.1.4.1.1466.115.121.1.15"; at->at_equality_oid = "2.5.13.2"; + at->at_ordering_oid = "2.5.13.3"; + at->at_substr_oid = "2.5.13.4"; } else if ( strcasecmp( argv[lasti], "telephone" ) == 0 || strcasecmp( argv[lasti], "tel" ) == 0 ) { at->at_syntax_oid = "1.3.6.1.4.1.1466.115.121.1.50"; at->at_equality_oid = "2.5.13.20"; + at->at_substr_oid = "2.5.13.21"; } else if ( strcasecmp( argv[lasti], "dn" ) == 0 ) { at->at_syntax_oid = "1.3.6.1.4.1.1466.115.121.1.12"; at->at_equality_oid = "2.5.13.1"; } else if ( strcasecmp( argv[lasti], "caseexactstring" ) == 0 || strcasecmp( argv[lasti], "ces" ) == 0 ) { at->at_syntax_oid = "1.3.6.1.4.1.1466.115.121.1.15"; - /* notice: this is caseExactIA5Match */ - at->at_equality_oid = "1.3.6.1.4.1.1466.109.114.1"; + at->at_equality_oid = "2.5.13.5"; + at->at_ordering_oid = "2.5.13.6"; + at->at_substr_oid = "2.5.13.7"; } else if ( strcasecmp( argv[lasti], "binary" ) == 0 || strcasecmp( argv[lasti], "bin" ) == 0 ) { at->at_syntax_oid = "1.3.6.1.4.1.1466.115.121.1.5"; @@ -514,8 +518,7 @@ at_add( if ( !strcmp(at->at_syntax_oid, "1.3.6.1.4.1.1466.115.121.1.15") ) { if ( at->at_equality_oid && - !strcmp(at->at_equality_oid, - "1.3.6.1.4.1.1466.109.114.1") ) { + !strcmp(at->at_equality_oid, "2.5.13.5") ) { sat->sat_syntax_compat = SYNTAX_CES; } else { sat->sat_syntax_compat = SYNTAX_CIS; -- 2.39.5