From 3c8cc66320d9cb909cc8bea043280cace8bb5ff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 4 Apr 2019 17:44:39 +0200 Subject: [PATCH] Remove facsimileNumberMatch rule from 2.5.4.23 OID in core schema MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When running tests that need an LDAP server, the tests fail because the server dies. It's because my openldap-2.4.46 reports a syntax error in ./data/core.schema: $ /usr/sbin/slapd -f ./temp/slapd.conf -h ldap://localhost:9009/ -d 64 [...] 5ca625e4 ./data/core.schema: line 192 (attributetype ( 2.5.4.23 NAME ( 'facsimileTelephoneNumber' 'fax' ) DESC 'RFC2256: Facsimile (Fax) Telephone Number' EQUALITY facsimileNumberMatch SUBSTR facsimileNumberSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.22 )) 5ca625e4 ./data/core.schema: line 192 attributetype: MatchingRule not found: "facsimileNumberMatch" This patch removes the offending matching rule because facsimileNumberMatch is nowhere defined in the schema. (Maybe it was built into previous openldap versions and removed later). Signed-off-by: Petr Písař --- data/core.schema | 2 -- 1 file changed, 2 deletions(-) diff --git a/data/core.schema b/data/core.schema index fd89c58..4e57898 100644 --- a/data/core.schema +++ b/data/core.schema @@ -187,8 +187,6 @@ attributetype ( 2.5.4.22 NAME 'teletexTerminalIdentifier' attributetype ( 2.5.4.23 NAME ( 'facsimileTelephoneNumber' 'fax' ) DESC 'RFC2256: Facsimile (Fax) Telephone Number' - EQUALITY facsimileNumberMatch - SUBSTR facsimileNumberSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.22 ) attributetype ( 2.5.4.24 NAME 'x121Address' -- 2.20.1