The branch, v3-2-test has been updated
via 58ec19243e59e05e0356760115c394b3a0158a63 (commit)
from 6a91468853d9c37993d109b079eb042d1b33cba9 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 58ec19243e59e05e0356760115c394b3a0158a63
Author: Karolin Seeger <[email protected]>
Date: Mon Aug 17 11:25:42 2009 +0200
Revert "s3-ldap: Fix Bug #5879. Update LDAP schema for Netscape DS 5."
This reverts commit 6a91468853d9c37993d109b079eb042d1b33cba9.
Forgot for a second that there won't be any 3.2 maintenance releases...
-----------------------------------------------------------------------
Summary of changes:
examples/LDAP/samba-schema-netscapeds5.x | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/examples/LDAP/samba-schema-netscapeds5.x
b/examples/LDAP/samba-schema-netscapeds5.x
index 661521c..efc528b 100644
--- a/examples/LDAP/samba-schema-netscapeds5.x
+++ b/examples/LDAP/samba-schema-netscapeds5.x
@@ -4,11 +4,9 @@
## Thomas Mueller 12.04.2003, [email protected]
## Richard Renard [email protected] 2005-01-28
## - added support for MungedDial, BadPasswordCount, BadPasswordTime,
PasswordHistory, LogonHours
-## TAKEDA Yasuma [email protected] 2008-11-06
-## - added sambaTrustedDomainPassword objectClasses
## - in Sun One 5.2 copy it as 99samba-schema-netscapeds5.ldif
##
-## Samba 3.2 schema file for Netscape DS 5.x
+## Samba 3.0 schema file for Netscape DS 5.x
##
##
INSTALL-DIRECTORY/slapd-your_name/config/schema/samba-schema-netscapeds5.ldif
####################################################################
@@ -35,7 +33,6 @@ objectClasses: ( 1.3.6.1.4.1.7165.2.2.5 NAME 'sambaDomain'
SUP top STRUCTURAL DE
objectClasses: ( 1.3.6.1.4.1.7165.1.2.2.7 NAME 'sambaUnixIdPool' SUP top
AUXILIARY DESC 'Pool for allocating UNIX uids/gids' MUST ( uidNumber $
gidNumber ) X-ORIGIN 'user defined' )
objectClasses: ( 1.3.6.1.4.1.7165.1.2.2.8 NAME 'sambaIdmapEntry' SUP top
AUXILIARY DESC 'Mapping from a SID to an ID' MUST ( sambaSID ) MAY ( uidNumber
$ gidNumber ) X-ORIGIN 'user defined' )
objectClasses: ( 1.3.6.1.4.1.7165.1.2.2.9 NAME 'sambaSidEntry' SUP top
STRUCTURAL DESC 'Structural Class for a SID' MUST ( sambaSID ) X-ORIGIN 'user
defined' )
-objectClasses: ( 1.3.6.1.4.1.7165.2.2.15 NAME 'sambaTrustedDomainPassword' SUP
top STRUCTURAL DESC 'Samba Trusted Domain Password' MUST ( sambaDomainName $
sambaSID $ sambaClearTextPassword $ sambaPwdLastSet ) MAY (
sambaPreviousClearTextPassword ) X-ORIGIN 'user defined')
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.24 NAME 'sambaLMPassword' DESC
'LanManager Password' EQUALITY caseIgnoreIA5Match SYNTAX
1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE X-ORIGIN 'user defined' )
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.25 NAME 'sambaNTPassword' DESC 'MD4
hash of the unicode password' EQUALITY caseIgnoreIA5Match SYNTAX
1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE X-ORIGIN 'user defined' )
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.26 NAME 'sambaAcctFlags' DESC
'Account Flags' EQUALITY caseIgnoreIA5Match SYNTAX
1.3.6.1.4.1.1466.115.121.1.26{16} SINGLE-VALUE X-ORIGIN 'user defined' )
@@ -63,5 +60,3 @@ attributeTypes: ( 1.3.6.1.4.1.7165.2.1.21 NAME
'sambaNextUserRid' DESC 'Next NT
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.22 NAME 'sambaNextGroupRid' DESC 'Next
NT rid to give out for groups' EQUALITY integerMatch SYNTAX
1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user defined' )
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.39 NAME 'sambaNextRid' DESC 'Next NT
rid to give out for anything' EQUALITY integerMatch SYNTAX
1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user defined' )
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.40 NAME 'sambaAlgorithmicRidBase' DESC
'Base at which the samba RID generation algorithm should operate' EQUALITY
integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user
defined' )
-attributeTypes: ( 1.3.6.1.4.1.7165.2.1.68 NAME 'sambaClearTextPassword' DESC
'Clear text password (used for trusted domain passwords)' EQUALITY
octetStringMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 X-ORIGIN 'user defined')
-attributeTypes: ( 1.3.6.1.4.1.7165.2.1.69 NAME
'sambaPreviousClearTextPassword' DESC 'Previous clear text password (used for
trusted domain passwords)' EQUALITY octetStringMatch SYNTAX
1.3.6.1.4.1.1466.115.121.1.40 X-ORIGIN 'user defined')
--
Samba Shared Repository
