r5061: fix typo in OL schema file

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index dee91a009c55463a60c0d9ab9c2d37bdbb4cdf8f..2702749505d463f96794995383d7bf1b1720b3da 100644 (file)
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -57,8 +57,10 @@ o   Gerald (Jerry) Carter <jerry@samba.org>
     * Allow root to grant/revoke privilege assignments.
     * Correct interaction between user rights and se_access_check() on
       SAMR objects.
+    * BUG 2286: Fix typo OpenLDAP schema file for sambaConfig object 
+      class.
 
-    
+ 
 o   Guenther Deschner <gd@samba.org>
     * Fix configure.in tests using KRB5_CONFIG variable and krb5-
       config utility.

diff --git a/examples/LDAP/samba.schema b/examples/LDAP/samba.schema
index 213aa34613f281ca2ed4cf476cb529d05a44425a..2205c17309510238aeb36aa6f5c87ef558f01c93 100644 (file)
--- a/examples/LDAP/samba.schema
+++ b/examples/LDAP/samba.schema
@@ -389,6 +389,16 @@ attributetype ( 1.3.6.1.4.1.7165.2.1.53 NAME 'sambaTrustFlags'
        EQUALITY caseIgnoreIA5Match
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
+attributetype ( 1.3.6.1.4.1.7165.2.1.56 NAME 'sambaAccountPolicyName'
+       DESC 'Account Policy Name'
+       EQUALITY caseIgnoreMatch
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{255} SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.57 NAME 'sambaAccountPolicyValue'
+       DESC 'Account Policy Value'
+       EQUALITY integerMatch
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
 
 #######################################################################
 ##              objectClasses used by Samba 3.0 schema               ##
@@ -457,7 +467,7 @@ objectclass ( 1.3.6.1.4.1.7165.2.2.9 NAME 'sambaSidEntry' SUP top STRUCTURAL
        DESC 'Structural Class for a SID'
        MUST ( sambaSID ) )
 
-objectclass ( 1.3.6.1.4.1.7165.1.2.2.10 NAME 'sambaConfig' SUP top AUXILIARY
+objectclass ( 1.3.6.1.4.1.7165.2.2.10 NAME 'sambaConfig' SUP top AUXILIARY
        DESC 'Samba Configuration Section'
        MAY ( description ) )
 
@@ -479,3 +489,8 @@ objectclass ( 1.3.6.1.4.1.7165.2.2.12 NAME 'sambaConfigOption' SUP top STRUCTURA
 ##     MUST ( sambaSID )
 ##     MAY ( sambaPrivilegeList ) )
 
+objectclass ( 1.3.6.1.4.1.7165.2.2.15 NAME 'sambaAccountPolicy' SUP top STRUCTURAL
+       DESC 'Samba Account Policy'
+       MUST ( sambaAccountPolicyName $ sambaAccountPolicyValue )
+       MAY ( description ) )
+