diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-01-05 16:19:00 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:36:55 -0500 |
| commit | 2c266fb217f7eccb45cebc95857ed968445c5742 (patch) | |
| tree | 13d83501d42451e1a44b7320b36cc9103ff24a24 /source4 | |
| parent | 8b70764038cd08020ab1c22b7f54cbec10acc6a0 (diff) | |
| download | samba-2c266fb217f7eccb45cebc95857ed968445c5742.tar.gz samba-2c266fb217f7eccb45cebc95857ed968445c5742.tar.bz2 samba-2c266fb217f7eccb45cebc95857ed968445c5742.zip | |
r20554: - use ${ROOTDN} for the rootDomainNamingContext
- the ${CONFIGDN} is a child of the ${ROOTDN}
metze
(This used to be commit ebbd8a83c982efdc58e53798d1fd191f08731005)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/scripting/libjs/provision.js | 3 | ||||
| -rw-r--r-- | source4/setup/provision_init.ldif | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js index 80362ce7f2..60ab6f7093 100644 --- a/source4/scripting/libjs/provision.js +++ b/source4/scripting/libjs/provision.js @@ -697,7 +697,8 @@ function provision_guess() subobj.DNSDOMAIN); rdn_list = split(".", subobj.DNSDOMAIN); subobj.BASEDN = "DC=" + join(",DC=", rdn_list); - subobj.CONFIGDN = "CN=Configuration," + subobj.BASEDN; + subobj.ROOTDN = subobj.ROOTDN; + subobj.CONFIGDN = "CN=Configuration," + subobj.ROOTDN; subobj.SCHEMADN = "CN=Schema," + subobj.CONFIGDN; subobj.LDAPBACKEND = "users.ldb"; subobj.LDAPMODULE = "entryUUID"; diff --git a/source4/setup/provision_init.ldif b/source4/setup/provision_init.ldif index 92fc17822f..5f57651f16 100644 --- a/source4/setup/provision_init.ldif +++ b/source4/setup/provision_init.ldif @@ -47,7 +47,7 @@ dn: cn=ROOTDSE subschemaSubentry: CN=Aggregate,${SCHEMADN} dsServiceName: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN} defaultNamingContext: ${BASEDN} -rootDomainNamingContext: ${BASEDN} +rootDomainNamingContext: ${ROOTDN} configurationNamingContext: ${CONFIGDN} schemaNamingContext: ${SCHEMADN} supportedLDAPVersion: 3 |