From: Howard Chu Date: Sat, 15 Aug 2015 00:42:12 +0000 (+0100) Subject: ITS#8185 fix OID collision X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=150cf51c344974b2cd3f96f16cb4fdd1ac5f953f;p=openldap ITS#8185 fix OID collision --- diff --git a/servers/slapd/schema/ppolicy.ldif b/servers/slapd/schema/ppolicy.ldif index 1aa9c33b3f..759c96daae 100644 --- a/servers/slapd/schema/ppolicy.ldif +++ b/servers/slapd/schema/ppolicy.ldif @@ -75,7 +75,7 @@ olcAttributeTypes: {14}( 1.3.6.1.4.1.42.2.27.8.1.15 NAME 'pwdSafeModify' EQUAL olcAttributeTypes: {15}( 1.3.6.1.4.1.4754.1.99.1 NAME 'pwdCheckModule' DESC 'L oadable module that instantiates "check_password() function' EQUALITY caseExa ctIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) -olcAttributeTypes: {16}( 1.3.6.1.4.1.42.2.27.8.1.16 NAME 'pwdMaxRecordedFailur +olcAttributeTypes: {16}( 1.3.6.1.4.1.42.2.27.8.1.30 NAME 'pwdMaxRecordedFailur e' EQUALITY integerMatch ORDERING integerOrderingMatch SYNTAX 1.3.6.1.4.1. 1466.115.121.1.27 SINGLE-VALUE ) olcObjectClasses: {0}( 1.3.6.1.4.1.4754.2.99.1 NAME 'pwdPolicyChecker' SUP top diff --git a/servers/slapd/schema/ppolicy.schema b/servers/slapd/schema/ppolicy.schema index 6d27e3bfa2..a9c7f11d37 100644 --- a/servers/slapd/schema/ppolicy.schema +++ b/servers/slapd/schema/ppolicy.schema @@ -332,7 +332,7 @@ attributetype ( 1.3.6.1.4.1.42.2.27.8.1.15 # is 0, it defaults to the value of pwdMaxFailure. If that value is also # 0, this value defaults to 5. -attributetype ( 1.3.6.1.4.1.42.2.27.8.1.16 +attributetype ( 1.3.6.1.4.1.42.2.27.8.1.30 NAME 'pwdMaxRecordedFailure' EQUALITY integerMatch ORDERING integerOrderingMatch