summaryrefslogtreecommitdiff
path: root/source4/selftest/Samba4.pm
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/selftest/Samba4.pm
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/selftest/Samba4.pm')
-rw-r--r--source4/selftest/Samba4.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/selftest/Samba4.pm b/source4/selftest/Samba4.pm
index ec34358e0a..1da0439757 100644
--- a/source4/selftest/Samba4.pm
+++ b/source4/selftest/Samba4.pm
@@ -281,6 +281,8 @@ sub provision($$$$$$)
$localdomain = $netbiosname if $server_role eq "member server";
my $localrealm = $realm;
$localrealm = $netbiosname if $server_role eq "member server";
+ my $localbasedn = $basedn;
+ $localbasedn = "DC=$netbiosname" if $server_role eq "member server";
open(CONFFILE, ">$conffile");
print CONFFILE "
@@ -400,7 +402,7 @@ my @provision_options = ("$self->{bindir}/smbscript", "$self->{setupdir}/provisi
push (@provision_options, "--krbtgtpass=krbtgt$password");
push (@provision_options, "--machinepass=machine$password");
push (@provision_options, "--root=$root");
- push (@provision_options, "--simple-bind-dn=cn=Manager,$basedn");
+ push (@provision_options, "--simple-bind-dn=cn=Manager,$localbasedn");
push (@provision_options, "--password=$password");
push (@provision_options, "--root=$root");
@@ -430,7 +432,7 @@ my @provision_options = ("$self->{bindir}/smbscript", "$self->{setupdir}/provisi
if (defined($self->{ldap})) {
push (@provision_options, "--ldap-backend=$ldap_uri");
- system("$self->{bindir}/smbscript $self->{setupdir}/provision-backend $configuration --ldap-manager-pass=$password --root=$root --realm=$dnsname --host-name=$netbiosname --ldap-backend-type=$self->{ldap}>&2") == 0 or die("backend provision failed");
+ system("$self->{bindir}/smbscript $self->{setupdir}/provision-backend $configuration --ldap-manager-pass=$password --root=$root --realm=$localrealm --host-name=$netbiosname --ldap-backend-type=$self->{ldap}>&2") == 0 or die("backend provision failed");
if ($self->{ldap} eq "openldap") {
($ret->{SLAPD_CONF}, $ret->{OPENLDAP_PIDFILE}) = $self->mk_openldap($ldapdir, $configuration) or die("Unable to create openldap directories");