summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-07-05 06:15:40 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:59:08 -0500
commit967866f17084df7a78ed6ecfcb9d2b31deaa28a1 (patch)
tree0827759af3160905337f746044bbadbfb62d0773 /source4/scripting
parentcc0756c3020ff4e1c7cc3f5945155b3375e9b608 (diff)
downloadsamba-967866f17084df7a78ed6ecfcb9d2b31deaa28a1.tar.gz
samba-967866f17084df7a78ed6ecfcb9d2b31deaa28a1.tar.bz2
samba-967866f17084df7a78ed6ecfcb9d2b31deaa28a1.zip
r23720: Allow the member server to work against an LDAP Backend. Another case
where LDB isn't as strict as OpenLDAP, the self join record contains duplicate servicePrincipalNames once the DNS name and domain name are made equal. (Easier to just skip the useless self-join). Andrew Bartlett (This used to be commit 49ff929be6fcf57721532de13bdd7a7e1617af6f)
Diffstat (limited to 'source4/scripting')
-rw-r--r--source4/scripting/libjs/provision.js10
1 files changed, 10 insertions, 0 deletions
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 323c7cdacb..deaa97114a 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -700,6 +700,11 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
message("Setting up sam.ldb users and groups\n");
setup_add_ldif("provision_users.ldif", info, samdb, false);
+ if (lp.get("server role") == "domain controller") {
+ message("Setting up self join\n");
+ setup_add_ldif("provision_self_join.ldif", info, samdb, false);
+ }
+
if (setup_name_mappings(info, samdb) == false) {
return false;
}
@@ -769,6 +774,11 @@ function provision_schema(subobj, message, tmp_schema_path, paths)
/* Write out a DNS zone file, from the info in the current database */
function provision_dns(subobj, message, paths, session_info, credentials)
{
+ var lp = loadparm_init();
+ if (lp.get("server role") != "domain controller") {
+ message("No DNS zone required for role %s\n", lp.get("server role"));
+ return;
+ }
message("Setting up DNS zone: " + subobj.DNSDOMAIN + " \n");
var ldb = ldb_init();
ldb.session_info = session_info;