diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-07-21 11:28:24 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:29:53 -0500 |
| commit | f8c1258d01fa631b719579e186b28027a34887cf (patch) | |
| tree | e1a6c5ae8cff680daeec979ab35cbc1085f91821 | |
| parent | 989a4b673da1ac77be48cd3bff43305ff1352d05 (diff) | |
| download | samba-f8c1258d01fa631b719579e186b28027a34887cf.tar.gz samba-f8c1258d01fa631b719579e186b28027a34887cf.tar.bz2 samba-f8c1258d01fa631b719579e186b28027a34887cf.zip | |
r8677: The first part of the domain name may not be equal to the netbios domain name.
Remove the use of flatname from the main domain object, we no longer
reference it.
Andrew Bartlett
(This used to be commit 2303e24be74570187b23c3d31d0433263c83ba7e)
| -rw-r--r-- | source4/scripting/libjs/provision.js | 3 | ||||
| -rw-r--r-- | source4/setup/provision.ldif | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js index 38f3fc066e..b6a7c5978b 100644 --- a/source4/scripting/libjs/provision.js +++ b/source4/scripting/libjs/provision.js @@ -268,6 +268,7 @@ function provision_guess() var subobj = new Object(); var nss = nss_init(); var lp = loadparm_init(); + var rdn_list; random_init(local); subobj.REALM = lp.get("realm"); @@ -302,6 +303,8 @@ function provision_guess() strlower(subobj.HOSTNAME), subobj.DNSDOMAIN); subobj.BASEDN = "DC=" + join(",DC=", split(".", subobj.REALM)); + rdn_list = split(".", subobj.REALM); + subobj.RDN_DC = rdn_list[0]; return subobj; } diff --git a/source4/setup/provision.ldif b/source4/setup/provision.ldif index c42c73eda4..d70d936988 100644 --- a/source4/setup/provision.ldif +++ b/source4/setup/provision.ldif @@ -5,9 +5,8 @@ dn: ${BASEDN} objectClass: top objectClass: domain objectClass: domainDNS -flatname: ${DOMAIN} dnsDomain: ${DNSDOMAIN} -dc: ${DOMAIN} +dc: ${RDN_DC} objectGUID: ${DOMAINGUID} creationTime: ${NTTIME} forceLogoff: 0x8000000000000000 |