svn commit: samba r12452 - branches/SAMBA_3_0/examples/LDAP
trunk/examples/LDAP
gd at samba.org
gd at samba.org
Fri Dec 23 14:45:57 GMT 2005
Author: gd
Date: 2005-12-23 14:45:56 +0000 (Fri, 23 Dec 2005)
New Revision: 12452
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12452
Log:
Fix Bug #3053 to allow esp. older eDirectory releases to load our LDAP
schema.
Maybe "Base64 encoded user parameter string" is not much clearer then
"munged dial" - anyone got a better description ?
Guenther
Modified:
branches/SAMBA_3_0/examples/LDAP/samba-nds.schema
branches/SAMBA_3_0/examples/LDAP/samba-schema-netscapeds5.x
branches/SAMBA_3_0/examples/LDAP/samba.schema
branches/SAMBA_3_0/examples/LDAP/samba.schema.at.IBM-DS
trunk/examples/LDAP/samba-nds.schema
trunk/examples/LDAP/samba-schema-netscapeds5.x
trunk/examples/LDAP/samba.schema
trunk/examples/LDAP/samba.schema.at.IBM-DS
Changeset:
Modified: branches/SAMBA_3_0/examples/LDAP/samba-nds.schema
===================================================================
--- branches/SAMBA_3_0/examples/LDAP/samba-nds.schema 2005-12-23 14:21:50 UTC (rev 12451)
+++ branches/SAMBA_3_0/examples/LDAP/samba-nds.schema 2005-12-23 14:45:56 UTC (rev 12452)
@@ -123,7 +123,7 @@
dn: cn=schema
changetype: modify
add: attributetypes
-attributeTypes: ( 1.3.6.1.4.1.7165.2.1.47 NAME 'sambaMungedDial' DESC '' EQUALITY caseExactMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.47 NAME 'sambaMungedDial' DESC 'Base64 encoded user parameter string' EQUALITY caseExactMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )
dn: cn=schema
changetype: modify
Modified: branches/SAMBA_3_0/examples/LDAP/samba-schema-netscapeds5.x
===================================================================
--- branches/SAMBA_3_0/examples/LDAP/samba-schema-netscapeds5.x 2005-12-23 14:21:50 UTC (rev 12451)
+++ branches/SAMBA_3_0/examples/LDAP/samba-schema-netscapeds5.x 2005-12-23 14:45:56 UTC (rev 12452)
@@ -48,7 +48,7 @@
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.36 NAME 'sambaUserWorkstations' DESC 'List of user workstations the user is allowed to logon to' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{255} SINGLE-VALUE X-ORIGIN 'user defined' )
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.37 NAME 'sambaHomePath' DESC 'Home directory UNC path' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.38 NAME 'sambaDomainName' DESC 'Windows NT domain to which the user belongs' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
-attributeTypes: ( 1.3.6.1.4.1.7165.2.1.47 NAME 'sambaMungedDial' DESC '' EQUALITY caseExactMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.47 NAME 'sambaMungedDial' DESC 'Base64 encoded user parameter string' EQUALITY caseExactMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.48 NAME 'sambaBadPasswordCount' DESC 'Bad password attempt count' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.49 NAME 'sambaBadPasswordTime' DESC 'Time of the last bad password attempt' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.54 NAME 'sambaPasswordHistory' DESC 'Concatenated MD4 hashes of the unicode passwords used on this account' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} )
Modified: branches/SAMBA_3_0/examples/LDAP/samba.schema
===================================================================
--- branches/SAMBA_3_0/examples/LDAP/samba.schema 2005-12-23 14:21:50 UTC (rev 12451)
+++ branches/SAMBA_3_0/examples/LDAP/samba.schema 2005-12-23 14:45:56 UTC (rev 12452)
@@ -279,7 +279,7 @@
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
attributetype ( 1.3.6.1.4.1.7165.2.1.47 NAME 'sambaMungedDial'
- DESC ''
+ DESC 'Base64 encoded user parameter string'
EQUALITY caseExactMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )
Modified: branches/SAMBA_3_0/examples/LDAP/samba.schema.at.IBM-DS
===================================================================
--- branches/SAMBA_3_0/examples/LDAP/samba.schema.at.IBM-DS 2005-12-23 14:21:50 UTC (rev 12451)
+++ branches/SAMBA_3_0/examples/LDAP/samba.schema.at.IBM-DS 2005-12-23 14:45:56 UTC (rev 12452)
@@ -58,7 +58,7 @@
attributetypes=( 1.3.6.1.4.1.7165.2.1.46 NAME 'sambaStringListOption' DESC 'A string list option' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-attributetypes=( 1.3.6.1.4.1.7165.2.1.47 NAME 'sambaMungedDial' DESC 'munged dial' EQUALITY caseExactMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )
+attributetypes=( 1.3.6.1.4.1.7165.2.1.47 NAME 'sambaMungedDial' DESC 'Base64 encoded user parameter string' EQUALITY caseExactMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )
attributetypes=( 1.3.6.1.4.1.7165.2.1.48 NAME 'sambaBadPasswordCount' DESC 'Bad password attempt count' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
Modified: trunk/examples/LDAP/samba-nds.schema
===================================================================
--- trunk/examples/LDAP/samba-nds.schema 2005-12-23 14:21:50 UTC (rev 12451)
+++ trunk/examples/LDAP/samba-nds.schema 2005-12-23 14:45:56 UTC (rev 12452)
@@ -123,7 +123,7 @@
dn: cn=schema
changetype: modify
add: attributetypes
-attributeTypes: ( 1.3.6.1.4.1.7165.2.1.47 NAME 'sambaMungedDial' DESC '' EQUALITY caseExactMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.47 NAME 'sambaMungedDial' DESC 'Base64 encoded user parameter string' EQUALITY caseExactMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )
dn: cn=schema
changetype: modify
Modified: trunk/examples/LDAP/samba-schema-netscapeds5.x
===================================================================
--- trunk/examples/LDAP/samba-schema-netscapeds5.x 2005-12-23 14:21:50 UTC (rev 12451)
+++ trunk/examples/LDAP/samba-schema-netscapeds5.x 2005-12-23 14:45:56 UTC (rev 12452)
@@ -48,7 +48,7 @@
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.36 NAME 'sambaUserWorkstations' DESC 'List of user workstations the user is allowed to logon to' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{255} SINGLE-VALUE X-ORIGIN 'user defined' )
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.37 NAME 'sambaHomePath' DESC 'Home directory UNC path' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.38 NAME 'sambaDomainName' DESC 'Windows NT domain to which the user belongs' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
-attributeTypes: ( 1.3.6.1.4.1.7165.2.1.47 NAME 'sambaMungedDial' DESC '' EQUALITY caseExactMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.47 NAME 'sambaMungedDial' DESC 'Base64 encoded user parameter string' EQUALITY caseExactMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.48 NAME 'sambaBadPasswordCount' DESC 'Bad password attempt count' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.49 NAME 'sambaBadPasswordTime' DESC 'Time of the last bad password attempt' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.54 NAME 'sambaPasswordHistory' DESC 'Concatenated MD4 hashes of the unicode passwords used on this account' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} )
Modified: trunk/examples/LDAP/samba.schema
===================================================================
--- trunk/examples/LDAP/samba.schema 2005-12-23 14:21:50 UTC (rev 12451)
+++ trunk/examples/LDAP/samba.schema 2005-12-23 14:45:56 UTC (rev 12452)
@@ -279,7 +279,7 @@
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
attributetype ( 1.3.6.1.4.1.7165.2.1.47 NAME 'sambaMungedDial'
- DESC ''
+ DESC 'Base64 encoded user parameter string'
EQUALITY caseExactMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )
Modified: trunk/examples/LDAP/samba.schema.at.IBM-DS
===================================================================
--- trunk/examples/LDAP/samba.schema.at.IBM-DS 2005-12-23 14:21:50 UTC (rev 12451)
+++ trunk/examples/LDAP/samba.schema.at.IBM-DS 2005-12-23 14:45:56 UTC (rev 12452)
@@ -58,7 +58,7 @@
attributetypes=( 1.3.6.1.4.1.7165.2.1.46 NAME 'sambaStringListOption' DESC 'A string list option' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-attributetypes=( 1.3.6.1.4.1.7165.2.1.47 NAME 'sambaMungedDial' DESC 'munged dial' EQUALITY caseExactMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )
+attributetypes=( 1.3.6.1.4.1.7165.2.1.47 NAME 'sambaMungedDial' DESC 'Base64 encoded user parameter string' EQUALITY caseExactMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )
attributetypes=( 1.3.6.1.4.1.7165.2.1.48 NAME 'sambaBadPasswordCount' DESC 'Bad password attempt count' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
More information about the samba-cvs
mailing list