svn commit: samba r5061 - in branches/SAMBA_3_0_RELEASE: . examples/LDAP

[jerry at samba.org]

Author: jerry
Date: 2005-01-28 17:41:10 +0000 (Fri, 28 Jan 2005)
New Revision: 5061

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5061

Log:
fix typo in OL schema file
Modified:
   branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
   branches/SAMBA_3_0_RELEASE/examples/LDAP/samba.schema


Changeset:
Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
===================================================================
--- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt	2005-01-28 17:36:41 UTC (rev 5060)
+++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt	2005-01-28 17:41:10 UTC (rev 5061)
@@ -57,8 +57,10 @@
     * 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 at samba.org>
     * Fix configure.in tests using KRB5_CONFIG variable and krb5-
       config utility.

Modified: branches/SAMBA_3_0_RELEASE/examples/LDAP/samba.schema
===================================================================
--- branches/SAMBA_3_0_RELEASE/examples/LDAP/samba.schema	2005-01-28 17:36:41 UTC (rev 5060)
+++ branches/SAMBA_3_0_RELEASE/examples/LDAP/samba.schema	2005-01-28 17:41:10 UTC (rev 5061)
@@ -389,7 +389,17 @@
 	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 @@
 	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 @@
 ##	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 ) )
+