diff options
| author | Matthieu Patou <mat@matws.net> | 2009-09-23 01:49:22 +0400 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de> | 2009-10-02 12:45:01 +0200 |
| commit | 8bf517d340b4abbbcbda39c35e449d3c896a3728 (patch) | |
| tree | a1e48ead70a6b350703b84a16669ba2348ecba00 /source4/setup | |
| parent | 977a0aa273cf355408c51639bc1b30cab41f5642 (diff) | |
| download | samba-8bf517d340b4abbbcbda39c35e449d3c896a3728.tar.gz samba-8bf517d340b4abbbcbda39c35e449d3c896a3728.tar.xz samba-8bf517d340b4abbbcbda39c35e449d3c896a3728.zip | |
s4: Improve provisioning: use relax control
Give the possibility to specify controls when loading ldif files.
Relax control is specified by default for all ldb_add_diff (request Andrew B).
Set domainguid if specified at the creation of object instead of modifying afterward
Allow to specify objectGUID for NTDS object of the first DC this option is used during provision upgrade.
Diffstat (limited to 'source4/setup')
| -rw-r--r-- | source4/setup/provision_basedn.ldif | 2 | ||||
| -rw-r--r-- | source4/setup/provision_basedn_modify.ldif | 1 | ||||
| -rw-r--r-- | source4/setup/provision_self_join.ldif | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/source4/setup/provision_basedn.ldif b/source4/setup/provision_basedn.ldif index df34e4bbf08..0d81df34537 100644 --- a/source4/setup/provision_basedn.ldif +++ b/source4/setup/provision_basedn.ldif @@ -4,4 +4,4 @@ dn: ${DOMAINDN} objectClass: top objectClass: ${DOMAIN_OC} - +${DOMAINGUID} diff --git a/source4/setup/provision_basedn_modify.ldif b/source4/setup/provision_basedn_modify.ldif index 39fd08e0d87..7fc5c6bf86f 100644 --- a/source4/setup/provision_basedn_modify.ldif +++ b/source4/setup/provision_basedn_modify.ldif @@ -110,4 +110,3 @@ wellKnownObjects: B:32:a361b2ffffd211d1aa4b00c04fd7d83a:OU=Domain Controllers,${ wellKnownObjects: B:32:aa312825768811d1aded00c04fd8d5cd:CN=Computers,${DOMAINDN} wellKnownObjects: B:32:a9d1ca15768811d1aded00c04fd8d5cd:CN=Users,${DOMAINDN} - -${DOMAINGUID_MOD} diff --git a/source4/setup/provision_self_join.ldif b/source4/setup/provision_self_join.ldif index 639bc960401..0d28b51a434 100644 --- a/source4/setup/provision_self_join.ldif +++ b/source4/setup/provision_self_join.ldif @@ -67,6 +67,7 @@ msDS-hasMasterNCs: ${SCHEMADN} msDS-hasMasterNCs: ${DOMAINDN} options: 1 systemFlags: 33554432 +${NTDSGUID} # Provides an account for DNS keytab export dn: CN=dns,CN=Users,${DOMAINDN} |