[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  017e401... s4:AD content - Implement the new password settings container
       via  973ea19... s4:AD content - adequate some revision levels to match Windows Server 2008
       via  e592dee... s4:AD content - Add the DFSR objects which exist on Windows Server >= 2008
      from  65914ed... s3: Avoid calling cli_alloc_mid twice in cli_smb_req_iov_send

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 017e401dedcd22feeb28c49aee9592befdce1e69
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Sat Feb 20 11:17:23 2010 +0100

    s4:AD content - Implement the new password settings container

commit 973ea198677c581064fad62cdac30baac7103ef8
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Sat Feb 20 11:16:58 2010 +0100

    s4:AD content - adequate some revision levels to match Windows Server 2008

commit e592deeb1ae587f1fe18e1f12531dec1f39d3553
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Sat Feb 20 11:15:25 2010 +0100

    s4:AD content - Add the DFSR objects which exist on Windows Server >= 2008
    
    Those replace the FRS ones.

-----------------------------------------------------------------------

Summary of changes:
 source4/setup/provision.ldif               |   31 ++++++++++++++++++++++++---
 source4/setup/provision_configuration.ldif |    6 ++--
 source4/setup/provision_self_join.ldif     |    4 +-
 3 files changed, 32 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/setup/provision.ldif b/source4/setup/provision.ldif
index 93fa0bf..75668c6 100644
--- a/source4/setup/provision.ldif
+++ b/source4/setup/provision.ldif
@@ -131,6 +131,26 @@ objectClass: dfsConfiguration
 isCriticalSystemObject: TRUE
 showInAdvancedViewOnly: FALSE
 
+dn: CN=DFSR-GlobalSettings,CN=System,${DOMAINDN}
+objectClass: top
+objectClass: msDFSR-GlobalSettings
+msDFSR-Flags: 48
+
+dn: CN=Domain System Volume,CN=DFSR-GlobalSettings,CN=System,${DOMAINDN}
+objectClass: top
+objectClass: msDFSR-ReplicationGroup
+msDFSR-ReplicationGroupType: 1
+
+dn: CN=Content,CN=Domain System Volume,CN=DFSR-GlobalSettings,CN=System,${DOMAINDN}
+objectClass: top
+objectClass: msDFSR-Content
+
+dn: CN=Topology,CN=Domain System Volume,CN=DFSR-GlobalSettings,CN=System,${DOMAINDN}
+objectClass: top
+objectClass: msDFSR-Topology
+
+# Here are missing the DFSR objects since we don't support this technique yet
+
 # Domain updates
 
 dn: CN=DomainUpdates,CN=System,${DOMAINDN}
@@ -140,7 +160,7 @@ objectClass: container
 dn: CN=ActiveDirectoryUpdate,CN=DomainUpdates,CN=System,${DOMAINDN}
 objectClass: top
 objectClass: container
-revision: 5
+revision: 3
 
 dn: CN=Operations,CN=DomainUpdates,CN=System,${DOMAINDN}
 objectClass: top
@@ -365,7 +385,7 @@ objectClass: container
 dn: CN=Windows2003Update,CN=DomainUpdates,CN=System,${DOMAINDN}
 objectClass: top
 objectClass: container
-revision: 8
+revision: 9
 
 # End domain updates
 
@@ -376,8 +396,6 @@ objectClass: nTFRSSettings
 systemFlags: -1946157056
 isCriticalSystemObject: TRUE
 
-# Here are missing the FRS objects since we don't support this technique yet
-
 dn: CN=FileLinks,CN=System,${DOMAINDN}
 objectClass: top
 objectClass: fileLinkTracking
@@ -413,6 +431,11 @@ objectClass: top
 objectClass: container
 displayName: DNS Servers
 
+dn: CN=Password Settings Container,CN=System,${DOMAINDN}
+objectClass: top
+objectClass: msDS-PasswordSettingsContainer
+systemFlags: -1946157056
+
 dn: CN=Policies,CN=System,${DOMAINDN}
 objectClass: top
 objectClass: container
diff --git a/source4/setup/provision_configuration.ldif b/source4/setup/provision_configuration.ldif
index 13d162e..5c79b8b 100644
--- a/source4/setup/provision_configuration.ldif
+++ b/source4/setup/provision_configuration.ldif
@@ -650,12 +650,12 @@ objectClass: container
 dn: CN=ActiveDirectoryRodcUpdate,CN=ForestUpdates,${CONFIGDN}
 objectClass: top
 objectClass: container
-revision: 5
+revision: 2
 
 dn: CN=ActiveDirectoryUpdate,CN=ForestUpdates,${CONFIGDN}
 objectClass: top
 objectClass: container
-revision: 5
+revision: 2
 
 dn: CN=Operations,CN=ForestUpdates,${CONFIGDN}
 objectClass: top
@@ -812,7 +812,7 @@ objectClass: container
 dn: CN=Windows2003Update,CN=ForestUpdates,${CONFIGDN}
 objectClass: top
 objectClass: container
-revision: 9
+revision: 10
 
 # End forest updates
 
diff --git a/source4/setup/provision_self_join.ldif b/source4/setup/provision_self_join.ldif
index 6cfdc19..d4d06f6 100644
--- a/source4/setup/provision_self_join.ldif
+++ b/source4/setup/provision_self_join.ldif
@@ -9,14 +9,14 @@ objectClass: user
 objectClass: computer
 accountExpires: 9223372036854775807
 dNSHostName: ${DNSNAME}
-# "frsComputerReferenceBL" doesn't exist since we still miss FRS support
+# "MSDFSR-ComputerReferenceBL" doesn't exist since we still miss DFSR support
 isCriticalSystemObject: TRUE
 localPolicyFlags: 0
 operatingSystem: Samba
 operatingSystemVersion: ${SAMBA_VERSION_STRING}
 primaryGroupID: 516
 sAMAccountName: ${NETBIOSNAME}$
-# "servicePrincipalName" for FRS doesn't exit since we still miss FRS support
+# "servicePrincipalName"s for FRS and DFSR don't exit since we still miss DFRS support
 # "servicePrincipalName"s for DNS ("ldap/../ForestDnsZones",
 # "ldap/../DomainDnsZones", "DNS/..") don't exist since we don't support AD DNS
 servicePrincipalName: GC/${DNSNAME}/${REALM}


-- 
Samba Shared Repository