[Dev OpenGP] [27] AD schemas without modifying OID

[subversion@xxxxxxxxxxxxx]

Revision: 27
Author:   alband85
Date:     2009-03-10 10:56:18 +0100 (Tue, 10 Mar 2009)

Log Message:
-----------
AD schemas without modifying OID

Modified Paths:
--------------
    trunk/schemas/ogp.schema
    trunk/schemas/samba-ad.schema


Modified: trunk/schemas/ogp.schema
===================================================================
--- trunk/schemas/ogp.schema	2009-03-10 09:54:16 UTC (rev 26)
+++ trunk/schemas/ogp.schema	2009-03-10 09:56:18 UTC (rev 27)
@@ -29,29 +29,17 @@
 
 objectclass (
   1.3.6.1.4.1.7135.1.3.136.2.2
-  NAME 'organizationalUnit'
-  SUP top
+  NAME 'oGPOrganizationalUnit'
+  SUP organizationalUnit
   STRUCTURAL
-  MUST ( ou )
-  MAY ( x121Address $ telexNumber $ desktopProfile $ businessCategory $ st $
-   preferredDeliveryMethod $ thumbnailLogo $ gPLink $ physicalDeliveryOfficeName $ userPassword $
-   teletexTerminalIdentifier $ l $ postalCode $ facsimileTelephoneNumber $ seeAlso $
-   defaultGroup $ uPNSuffixes $ msCOM-UserPartitionSetLink $ telephoneNumber $ searchGuide $
-   internationalISDNNumber $ countryCode $ postalAddress $ destinationIndicator $ co $
-   registeredAddress $ street $ managedBy $ c $ gPOptions $
-   postOfficeBox $ description $ oGPXMLConfig $ oGPSOA)
+  MAY ( description $ oGPXMLConfig $ oGPSOA )
   )
 
 objectclass (
   1.3.6.1.4.1.7135.1.3.136.2.1
-  NAME 'computer'
-  SUP user
+  NAME 'oGPComputer'
+  SUP computer
   STRUCTURAL
-  MAY ( volumeCount $ operatingSystemHotfix $ managedBy $ dNSHostName $ physicalLocationObject $
-   netbootGUID $ cn $ netbootMirrorDataFile $ defaultLocalPolicyObject $ operatingSystem $
-   siteGUID $ msDS-AdditionalSamAccountName $ operatingSystemVersion $ machineRole $ rIDSetReferences $
-   netbootMachineFilePath $ location $ networkAddress $ catalogs $ operatingSystemServicePack $
-   msDS-AdditionalDnsHostName $ policyReplicationFlags $ localPolicyFlags $ netbootInitialization $ netbootSIFFile $ 
-   oGPXMLConfig $ oGPMachineCertificate $ description $ oGPSOA)
+  MAY ( oGPXMLConfig $ oGPMachineCertificate $ description $ oGPSOA )
   )
 

Modified: trunk/schemas/samba-ad.schema
===================================================================
--- trunk/schemas/samba-ad.schema	2009-03-10 09:54:16 UTC (rev 26)
+++ trunk/schemas/samba-ad.schema	2009-03-10 09:56:18 UTC (rev 27)
@@ -1,8 +1,3 @@
-# 
-# Samba4 AD schema where computer and orghanizationalUnit
-# classes were removed (replaced by OGP classes in ogp.schema)
-#
-
 attributetype (
   1.2.840.113556.1.4.722
   NAME 'otherIpPhone'
@@ -4209,6 +4204,18 @@
   )
 
 objectclass (
+  1.2.840.113556.1.3.30
+  NAME 'computer'
+  SUP user
+  STRUCTURAL
+  MAY ( volumeCount $ operatingSystemHotfix $ managedBy $ dNSHostName $ physicalLocationObject $
+   netbootGUID $ cn $ netbootMirrorDataFile $ defaultLocalPolicyObject $ operatingSystem $
+   siteGUID $ msDS-AdditionalSamAccountName $ operatingSystemVersion $ machineRole $ rIDSetReferences $
+   netbootMachineFilePath $ location $ networkAddress $ catalogs $ operatingSystemServicePack $
+   msDS-AdditionalDnsHostName $ policyReplicationFlags $ localPolicyFlags $ netbootInitialization $ netbootSIFFile )
+  )
+
+objectclass (
   1.2.840.113556.1.5.2
   NAME 'samDomainBase'
   SUP top
@@ -4350,6 +4357,21 @@
   )
 
 objectclass (
+  2.5.6.5
+  NAME 'organizationalUnit'
+  SUP top
+  STRUCTURAL
+  MUST ( ou )
+  MAY ( x121Address $ telexNumber $ desktopProfile $ businessCategory $ st $
+   preferredDeliveryMethod $ thumbnailLogo $ gPLink $ physicalDeliveryOfficeName $ userPassword $
+   teletexTerminalIdentifier $ l $ postalCode $ facsimileTelephoneNumber $ seeAlso $
+   defaultGroup $ uPNSuffixes $ msCOM-UserPartitionSetLink $ telephoneNumber $ searchGuide $
+   internationalISDNNumber $ countryCode $ postalAddress $ destinationIndicator $ co $
+   registeredAddress $ street $ managedBy $ c $ gPOptions $
+   postOfficeBox )
+  )
+
+objectclass (
   1.2.840.113556.1.3.9
   NAME 'dMD'
   SUP top