fixes from 2,2

(This used to be commit 46bd77a02a47c26c4981472c8cea09e64c2ef4d2)

2 files changed, 60 insertions, 28 deletions

diff --git a/docs/OID/allocated-arcs.txt b/docs/OID/allocated-arcs.txt
index cb7c04c74f..acef4930ea 100644
--- a/docs/OID/allocated-arcs.txt
+++ b/docs/OID/allocated-arcs.txt
@@ -1,7 +1,7 @@
 !===========================================================================================
 !==
 !==	Allocated Arcs from the Samba Team Private Enterprise Number
-!==	ISO(1) org(3) dod(6) internet(1) experimental(3) private(4) enterprise(1) Samba(7165)
+!==	ISO(1) org(3) dod(6) internet(1) private(4) enterprise(1) Samba(7165)
 !==	
 !==	Arc allocation is maintained by jerry carter <jerry@samba.org>.  Please notify
 !==	me if you need an OID and update this file.
diff --git a/examples/LDAP/samba.schema b/examples/LDAP/samba.schema
index 25184495eb..0f9ec5faa4 100644
--- a/examples/LDAP/samba.schema
+++ b/examples/LDAP/samba.schema
@@ -10,6 +10,9 @@
 ## 1.3.1.5.1.4.1.7165.2.2.x - objectclasses
 ##
 
+##
+## Password hashes
+##
 attributetype ( 1.3.6.1.4.1.7165.2.1.1 NAME 'lmPassword'
 	DESC 'LanManager Passwd'
 	EQUALITY caseIgnoreIA5Match
@@ -20,41 +23,50 @@ attributetype ( 1.3.6.1.4.1.7165.2.1.2 NAME 'ntPassword'
 	EQUALITY caseIgnoreIA5Match
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
 
-attributetype ( 1.3.6.1.4.1.7165.2.1.3 NAME 'pwdLastSet'
-	DESC 'NT pwdLastSet'
-	EQUALITY caseIgnoreIA5Match
-        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
-
+##
+## Account flags in string format ([UWDX     ])
+##
 attributetype ( 1.3.6.1.4.1.7165.2.1.4 NAME 'acctFlags'
 	DESC 'Account Flags'
 	EQUALITY caseIgnoreIA5Match
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{16} SINGLE-VALUE )
 
+## 
+## Password timestamps & policies
+##
+attributetype ( 1.3.6.1.4.1.7165.2.1.3 NAME 'pwdLastSet'
+	DESC 'NT pwdLastSet'
+	EQUALITY integerMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
 attributetype ( 1.3.6.1.4.1.7165.2.1.5 NAME 'logonTime'
 	DESC 'NT logonTime'
-	EQUALITY caseIgnoreIA5Match
-        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
+	EQUALITY integerMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 
 attributetype ( 1.3.6.1.4.1.7165.2.1.6 NAME 'logoffTime'
 	DESC 'NT logoffTime'
-	EQUALITY caseIgnoreIA5Match
-        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
+	EQUALITY integerMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 
 attributetype ( 1.3.6.1.4.1.7165.2.1.7 NAME 'kickoffTime'
 	DESC 'NT kickoffTime'
-	EQUALITY caseIgnoreIA5Match
-        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
+	EQUALITY integerMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 
 attributetype ( 1.3.6.1.4.1.7165.2.1.8 NAME 'pwdCanChange'
 	DESC 'NT pwdCanChange'
-	EQUALITY caseIgnoreIA5Match
-        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
+	EQUALITY integerMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 
 attributetype ( 1.3.6.1.4.1.7165.2.1.9 NAME 'pwdMustChange'
 	DESC 'NT pwdMustChange'
-	EQUALITY caseIgnoreIA5Match
-        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
+	EQUALITY integerMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 
+##
+## string settings
+##
 attributetype ( 1.3.6.1.4.1.7165.2.1.10 NAME 'homeDrive'
 	DESC 'NT homeDrive'
 	EQUALITY caseIgnoreIA5Match
@@ -75,34 +87,54 @@ attributetype ( 1.3.6.1.4.1.7165.2.1.13 NAME 'userWorkstations'
 	EQUALITY caseIgnoreIA5Match
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{255} SINGLE-VALUE )
 
+attributetype ( 1.3.6.1.4.1.7165.2.1.17 NAME 'smbHome'
+	DESC 'smbHome'
+	EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{128} )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.18 NAME 'domain'
+	DESC 'Windows NT domain to which the user belongs'
+	EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{128} )
+
+##
+## user and group RID
+##
 attributetype ( 1.3.6.1.4.1.7165.2.1.14 NAME 'rid'
 	DESC 'NT rid'
-	EQUALITY caseIgnoreIA5Match
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{255} SINGLE-VALUE )
+	EQUALITY integerMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 
 attributetype ( 1.3.6.1.4.1.7165.2.1.15 NAME 'primaryGroupID'
 	DESC 'NT Group RID'
-	EQUALITY caseIgnoreIA5Match
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{255} SINGLE-VALUE )
-
-attributetype ( 1.3.6.1.4.1.7165.2.1.17 NAME 'smbHome'
-	DESC 'smbHome'
-	EQUALITY caseIgnoreIA5Match
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{128} )
+	EQUALITY integerMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 
 ##
 ## The smbPasswordEntry objectclass has been depreciated in favor of the
 ## sambaAccount objectclass
 ##
-#objectclass ( 1.3.1.5.1.4.1.7165.2.2.1 NAME 'smbPasswordEntry' SUP top AUXILIARY
+#objectclass ( 1.3.6.1.4.1.7165.2.2.1 NAME 'smbPasswordEntry' SUP top AUXILIARY
 #        DESC 'Samba smbpasswd entry'
 #        MUST ( uid $ uidNumber )
 #        MAY  ( lmPassword $ ntPassword $ pwdLastSet $ acctFlags ))
 
-objectclass ( 1.3.1.5.1.4.1.7165.2.2.2 NAME 'sambaAccount' SUP top STRUCTURAL
+objectclass ( 1.3.6.1.4.1.7165.2.2.2 NAME 'sambaAccount' SUP top STRUCTURAL
 	DESC 'Samba Account'
 	MUST ( uid $ rid ) 
 	MAY  ( cn $ lmPassword $ ntPassword $ pwdLastSet $ logonTime $
                logoffTime $ kickoffTime $ pwdCanChange $ pwdMustChange $ acctFlags $ 
                displayName $ smbHome $ homeDrive $ scriptPath $ profilePath $
-               description $ userWorkstations $ primaryGroupID ))
+               description $ userWorkstations $ primaryGroupID $ domain ))
+
+##
+## Used for Winbind experimentation
+##
+objectclass ( 1.3.6.1.4.1.7165.1.2.2.3 NAME 'uidPool' SUP top AUXILIARY
+	DESC 'Pool for allocating UNIX uids'
+	MUST ( uidNumber $ cn ) )
+
+objectclass ( 1.3.6.1.4.1.7165.1.2.2.4 NAME 'gidPool' SUP top AUXILIARY
+	DESC 'Pool for allocating UNIX gids'
+	MUST ( gidNumber $ cn ) )
+