diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-09-14 13:24:07 -0700 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-09-14 13:24:07 -0700 |
| commit | 5464ce6df678a6ce3022f4a30fd9553996cefb69 (patch) | |
| tree | 86982aa8eda44b0de296f46171fdebb9a4be8597 /source4/setup | |
| parent | 72fcc6344f1ddfece4dd41790fc1add9c6d2c0f7 (diff) | |
| parent | 3dd404abad878fa7e760ba50ce84fc80b82ea159 (diff) | |
| download | samba-5464ce6df678a6ce3022f4a30fd9553996cefb69.tar.gz samba-5464ce6df678a6ce3022f4a30fd9553996cefb69.tar.bz2 samba-5464ce6df678a6ce3022f4a30fd9553996cefb69.zip | |
Merge branch 'master' of /home/tridge/samba/git/combined
Diffstat (limited to 'source4/setup')
| -rw-r--r-- | source4/setup/provision_configuration.ldif | 33 | ||||
| -rw-r--r-- | source4/setup/provision_group_policy.ldif | 6 |
2 files changed, 34 insertions, 5 deletions
diff --git a/source4/setup/provision_configuration.ldif b/source4/setup/provision_configuration.ldif index 35faed84bb..71f9949f67 100644 --- a/source4/setup/provision_configuration.ldif +++ b/source4/setup/provision_configuration.ldif @@ -2,7 +2,8 @@ # Configuration Naming Context ############################### -# Display specifiers are in "display-specifiers/DisplaySpecifiers-Win2k8R2.txt" +# Display specifiers are located in +# display-specifiers/DisplaySpecifiers-Win2k8R2.txt" # This file is parsed during provision using the ms_display_specifiers.py # script. @@ -746,6 +747,32 @@ objectClass: top objectClass: applicationSiteSettings objectClass: licensingSiteSettings +dn: CN=Inter-Site Transports,CN=Sites,${CONFIGDN} +objectClass: top +objectClass: interSiteTransportContainer +systemFlags: -2147483648 + +dn: CN=IP,CN=Inter-Site Transports,CN=Sites,${CONFIGDN} +objectClass: top +objectClass: interSiteTransport +transportAddressAttribute: dNSHostName +transportDLLName: ismip.dll + +dn: CN=DEFAULTIPSITELINK,CN=IP,CN=Inter-Site Transports,CN=Sites,${CONFIGDN} +objectClass: top +objectClass: siteLink +cost: 100 +replInterval: 180 +siteList: CN=${DEFAULTSITE},CN=Sites,${CONFIGDN} +systemFlags: 1073741824 + +dn: CN=SMTP,CN=Inter-Site Transports,CN=Sites,${CONFIGDN} +objectClass: top +objectClass: interSiteTransport +transportAddressAttribute: mailAddress +transportDLLName: ismsmtp.dll +options: 1 + dn: CN=NTDS Site Settings,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN} objectClass: top objectClass: applicationSiteSettings @@ -756,7 +783,3 @@ objectClass: top objectClass: serversContainer systemFlags: 33554432 -dn: CN=Subnets,CN=Sites,${CONFIGDN} -objectClass: top -objectClass: subnetContainer -systemFlags: -1073741824 diff --git a/source4/setup/provision_group_policy.ldif b/source4/setup/provision_group_policy.ldif index 00f0bee4cc..6f58bd4a38 100644 --- a/source4/setup/provision_group_policy.ldif +++ b/source4/setup/provision_group_policy.ldif @@ -14,17 +14,20 @@ gPCMachineExtensionNames: [{35378EAC-683F-11D2-A89A-00C04FBBCFA2}{53D6AB1B-248 gPCUserExtensionNames: [{3060E8D0-7020-11D2-842D-00C04FA372D4}{3060E8CE-7020-1 1D2-842D-00C04FA372D4}][{35378EAC-683F-11D2-A89A-00C04FBBCFA2}{0F6B957E-509E- 11D1-A7CC-0000F87571E3}] +isCriticalSystemObject: TRUE nTSecurityDescriptor: O:${DOMAINSID}-512G:${DOMAINSID}-512D:PAI(A;CI;RPWPCCDCLCLORCWOWDSDDTSW;;;${DOMAINSID}-512)(A;CI;RPWPCCDCLCLORCWOWDSDDTSW;;;${DOMAINSID}-519)(A;;RPWPCCDCLCLORCWOWDSDDTSW;;;${DOMAINSID}-512)(A;CIIO;RPWPCCDCLCLORCWOWDSDDTSW;;;CO)(A;CI;RPWPCCDCLCLORCWOWDSDDTSW;;;SY)(A;CI;RPLCLORC;;;AU)(OA;CI;CR;edacfd8f-ffb3-11d1-b41d-00a0c968f939;;AU)(A;CI;RPLCLORC;;;ED)S:AI(OU;CIIDSA;WPWD;;f30e3bc2-9ff0-11d1-b603-0000f80367c1;WD)(OU;CIIOIDSA;WP;f30e3bbe-9ff0-11d1-b603-0000f80367c1;bf967aa5-0de6-11d0-a285-00aa003049e2;WD)(OU;CIIOIDSA;WP;f30e3bbf-9ff0-11d1-b603-0000f80367c1;bf967aa5-0de6-11d0-a285-00aa003049e2;WD) systemFlags: -1946157056 dn: CN=User,CN={${POLICYGUID}},CN=Policies,CN=System,${DOMAINDN} objectClass: top objectClass: container +isCriticalSystemObject: TRUE systemFlags: -1946157056 dn: CN=Machine,CN={${POLICYGUID}},CN=Policies,CN=System,${DOMAINDN} objectClass: top objectClass: container +isCriticalSystemObject: TRUE systemFlags: -1946157056 dn: CN={${POLICYGUID_DC}},CN=Policies,CN=System,${DOMAINDN} @@ -38,16 +41,19 @@ versionNumber: 2 flags: 0 gPCMachineExtensionNames: [{827D319E-6EAC-11D2-A4EA-00C04F79F83A}{803E14A0-B4 FB-11D0-A0D0-00A0C90F574B}] +isCriticalSystemObject: TRUE nTSecurityDescriptor: O:${DOMAINSID}-512G:${DOMAINSID}-512D:PAI(A;CI;RPWPCCDCLCLORCWOWDSDDTSW;;;${DOMAINSID}-512)(A;CI;RPWPCCDCLCLORCWOWDSDDTSW;;;${DOMAINSID}-519)(A;;RPWPCCDCLCLORCWOWDSDDTSW;;;${DOMAINSID}-512)(A;CIIO;RPWPCCDCLCLORCWOWDSDDTSW;;;CO)(A;CI;RPWPCCDCLCLORCWOWDSDDTSW;;;SY)(A;CI;RPLCLORC;;;AU)(OA;CI;CR;edacfd8f-ffb3-11d1-b41d-00a0c968f939;;AU)(A;CI;RPLCLORC;;;ED)S:AI(OU;CIIDSA;WPWD;;f30e3bc2-9ff0-11d1-b603-0000f80367c1;WD)(OU;CIIOIDSA;WP;f30e3bbe-9ff0-11d1-b603-0000f80367c1;bf967aa5-0de6-11d0-a285-00aa003049e2;WD)(OU;CIIOIDSA;WP;f30e3bbf-9ff0-11d1-b603-0000f80367c1;bf967aa5-0de6-11d0-a285-00aa003049e2;WD) systemFlags: -1946157056 dn: CN=User,CN={${POLICYGUID_DC}},CN=Policies,CN=System,${DOMAINDN} objectClass: top objectClass: container +isCriticalSystemObject: TRUE systemFlags: -1946157056 dn: CN=Machine,CN={${POLICYGUID_DC}},CN=Policies,CN=System,${DOMAINDN} objectClass: top objectClass: container +isCriticalSystemObject: TRUE systemFlags: -1946157056 |