Patches for SAMBA 4

Fri Jul 10 01:48:22 MDT 2009

On Fri, 2009-07-10 at 09:28 +0200, Matthias Dieter Wallnöfer wrote:
> Here the patches

Thanks.  

> plain text document attachment
> (0002-SAMBA-4-directory-Cleans-up-schema_samba4.ldif.patch)
> >From 26bbfc0c1dfa6a7ddfbe17dc64ecece7da9394e4 Mon Sep 17 00:00:00 2001
> From: =?utf-8?q?Matthias=20Dieter=20Walln=C3=B6fer?= <mwallnoefer at yahoo.de>
> Date: Thu, 9 Jul 2009 23:00:05 +0200
> Subject: [SAMBA 4 directory] Cleans up "schema_samba4.ldif"
> 
> Removes unused structures
> ---
>  source4/setup/schema_samba4.ldif |  179 +------------------------------------
>  1 files changed, 5 insertions(+), 174 deletions(-)
> 
> diff --git a/source4/setup/schema_samba4.ldif b/source4/setup/schema_samba4.ldif
> index c11e65e..8024dd7 100644
> --- a/source4/setup/schema_samba4.ldif
> +++ b/source4/setup/schema_samba4.ldif
> @@ -1,125 +1,10 @@
>  #
>  # Schema elements which do not exist in AD, but which we use in Samba4
>  #
> -## Samba4 OID allocation from Samba3's examples/LDAP/samba.schema
> -## 1.3.6.1.4.1.7165.4.1.x - attributetypes
> -
> -## 1.3.6.1.4.1.7165.4.2.x - objectclasses
> -
> -## 1.3.6.1.4.1.7165.4.3.x - LDB/LDAP Controls
> -### see dsdb/samdb/samdb.h
> -
> -## 1.3.6.1.4.1.7165.4.4.x - LDB/LDAP Extended Operations
> -### see dsdb/samdb/samdb.h
> -
> -## 1.3.6.1.4.1.7165.4.255.x - mapped OIDs due to conflicts between AD and standards-track
> -#
> -#

If you want to remove these from the schema, we need to find somewhere
else to allocate the OIDs.  Currently, this is the 'samba4 oid
registry', and helps us avoid creating duplicate OIDs.

> -#
> -# Not used anymore
> -#
> -#dn: cn=ntpwdHash,${SCHEMADN}
> -#cn: ntpwdHash
> -#name: NTPWDHash
> -#objectClass: top
> -#objectClass: attributeSchema
> -#lDAPDisplayName: ntpwdhash
> -#isSingleValued: TRUE
> -#systemFlags: 17
> -#systemOnly: TRUE
> -#schemaIDGUID: E961130F-5084-458C-9E9C-DEC16DA08592
> -#adminDisplayName: NT-PWD-Hash
> -#attributeID: 1.3.6.1.4.1.7165.4.1.1
> -#attributeSyntax: 2.5.5.10
> -#oMSyntax: 4
>  
>  #
> -# Not used anymore
> +# Attribute used to save privileges
>  #
> -#dn: cn=lmpwdHash,${SCHEMADN}
> -#cn: lmpwdHash
> -#name: lmpwdHash
> -#objectClass: top
> -#objectClass: attributeSchema
> -#lDAPDisplayName: lmpwdhash
> -#isSingleValued: TRUE
> -#systemFlags: 17
> -#systemOnly: TRUE
> -#schemaIDGUID: CBD0D18C-9C54-4A77-87C4-5CEEAF781253
> -#adminDisplayName: LM-PWD-Hash
> -#attributeID: 1.3.6.1.4.1.7165.4.1.2
> -#attributeSyntax: 2.5.5.10
> -#oMSyntax: 4
> -
> -#
> -# Not used anymore
> -#
> -#dn: cn=sambaNtPwdHistory,${SCHEMADN}
> -#cn: sambaNtPwdHistory
> -#name: sambaNtPwdHistory
> -#objectClass: top
> -#objectClass: attributeSchema
> -#lDAPDisplayName: sambaNtPwdHistory
> -#isSingleValued: TRUE
> -#systemFlags: 17
> -#systemOnly: TRUE
> -#schemaIDGUID: 8CCD7658-C574-4435-A38C-99572E349E6B
> -#adminDisplayName: SAMBA-NT-PWD-History
> -#attributeID: 1.3.6.1.4.1.7165.4.1.3
> -#attributeSyntax: 2.5.5.10
> -#oMSyntax: 4
> -
> -#
> -# Not used anymore
> -#
> -#dn: cn=sambaLmPwdHistory,${SCHEMADN}
> -#cn: sambaLmPwdHistory
> -#name: sambaLmPwdHistory
> -#objectClass: top
> -#objectClass: attributeSchema
> -#lDAPDisplayName: sambaLmPwdHistory
> -#isSingleValued: FALSE
> -#systemFlags: 17
> -#systemOnly: TRUE
> -#schemaIDGUID: 0EAFE3DD-0F53-495E-8A34-97BB28AF17A4
> -#adminDisplayName: SAMBA-LM-PWDHistory
> -#attributeID: 1.3.6.1.4.1.7165.4.1.4
> -#attributeSyntax: 2.5.5.10
> -#oMSyntax: 4
> -
> -#
> -# Not used anymore
> -#
> -#dn: CN=sambaPassword,${SCHEMADN}
> -#objectClass: top
> -#objectClass: attributeSchema
> -#lDAPDisplayName: sambaPassword
> -#isSingleValued: FALSE
> -#systemFlags: 17
> -#systemOnly: TRUE
> -#schemaIDGUID: 87F10301-229A-4E69-B63A-998339ADA37A
> -#adminDisplayName: SAMBA-Password
> -#attributeID: 1.3.6.1.4.1.7165.4.1.5
> -#attributeSyntax: 2.5.5.5
> -#oMSyntax: 22
> -
> -#
> -# Not used anymore
> -#
> -#dn: cn=dnsDomain,${SCHEMADN}
> -#objectClass: top
> -#objectClass: attributeSchema
> -#lDAPDisplayName: dnsDomain
> -#isSingleValued: FALSE
> -#systemFlags: 17
> -#systemOnly: TRUE
> -#schemaIDGUID: A40165E6-5E45-44A7-A8FA-186C94333018
> -#adminDisplayName: DNS-Domain
> -#attributeID: 1.3.6.1.4.1.7165.4.1.6
> -#attributeSyntax: 2.5.5.4
> -#oMSyntax: 20

I don't particularly mind if these have to be removed - they have been
out of use for long enough now.

>  dn: cn=privilege,${SCHEMADN}
>  objectClass: top
> @@ -135,66 +20,10 @@ attributeSyntax: 2.5.5.4
>  oMSyntax: 20
>  
>  #
> -# Not used anymore
> +# Fedora DS uses this attribute on access controls and we need to set it via
> +# our module stack
>  #
> -#dn: CN=unixName,${SCHEMADN}
> -#cn: unixName
> -#name: unixName
> -#objectClass: top
> -#objectClass: attributeSchema
> -#lDAPDisplayName: unixName
> -#isSingleValued: TRUE
> -#systemFlags: 16
> -#systemOnly: FALSE
> -#schemaIDGUID: bf9679f2-0de6-11d0-a285-00aa003049e2
> -#adminDisplayName: Unix-Name
> -#attributeID: 1.3.6.1.4.1.7165.4.1.9
> -#attributeSyntax: 2.5.5.4
> -#oMSyntax: 20
> -
> -#
> -# Not used anymore
> -#
> -#dn: cn=krb5Key,${SCHEMADN}
> -#cn: krb5Key
> -#name: krb5Key
> -#objectClass: top
> -#objectClass: attributeSchema
> -#lDAPDisplayName: krb5Key
> -#isSingleValued: FALSE
> -#systemFlags: 17
> -#systemOnly: TRUE
> -#schemaIDGUID: 0EAFE3DD-0F53-495E-8A34-97BB28AF17A4
> -#adminDisplayName: krb5-Key
> -#attributeID: 1.3.6.1.4.1.5322.10.1.10
> -#attributeSyntax: 2.5.5.10
> -#oMSyntax: 4
> -
> -#Allocated: (not used anymore) DSDB_CONTROL_REPLICATED_OBJECT_OID 1.3.6.1.4.1.7165.4.3.1
> -
> -#Allocated: DSDB_CONTROL_CURRENT_PARTITION_OID 1.3.6.1.4.1.7165.4.3.2
>  
> -#Allocated: DSDB_CONTROL_REPLICATED_UPDATE_OID 1.3.6.1.4.1.7165.4.3.3
> -
> -#Allocated: DSDB_EXTENDED_REPLICATED_OBJECTS_OID 1.3.6.1.4.1.7165.4.4.1
> -#Allocated: DSDB_EXTENDED_SCHEMA_UPDATE_NOW_OID 1.3.6.1.4.1.7165.4.4.2
> -#Allocated: LDB_EXTENDED_SEQUENCE_NUMBER 1.3.6.1.4.1.7165.4.4.3
> -
> -#Allocated: (middleName) attributeID: 1.3.6.1.4.1.7165.4.255.1
> -
> -#Allocated: (defaultGroup) attributeID: 1.3.6.1.4.1.7165.4.255.2
> -
> -#Allocated: (modifyTimestamp) samba4ModifyTimestamp: 1.3.6.1.4.1.7165.4.255.3
> -#Allocated: (subSchema) samba4SubSchema: 1.3.6.1.4.1.7165.4.255.4
> -#Allocated: (objectClasses) samba4ObjectClasses: 1.3.6.1.4.1.7165.4.255.5
> -#Allocated: (ditContentRules) samba4DitContentRules: 1.3.6.1.4.1.7165.4.255.6
> -#Allocated: (attributeTypes) samba4AttributeTypes: 1.3.6.1.4.1.7165.4.255.7
> -#Allocated: (dynamicObject) samba4DynamicObject: 1.3.6.1.4.1.7165.4.255.8
> -#Allocated: (entryTTL) samba4EntryTTL: 1.3.6.1.4.1.7165.4.255.9
> -

(The same goes for the individual OID allocations below)

Andrew Bartlett
-- 
Andrew Bartlett
http://samba.org/~abartlet/
Authentication Developer, Samba Team           http://samba.org
Samba Developer, Cisco Inc.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : http://lists.samba.org/archive/samba-technical/attachments/20090710/366e5819/attachment.bin