summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-04-29 13:54:51 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:51:46 -0500
commitc36eedf35c1198f75bec98a7604110ee109f5b15 (patch)
tree4a2b6e7e26fd50619ba7e9019455a4aae5fe304f /source4
parent498166904d4785650b8a3b7ade41dcc499941802 (diff)
downloadsamba-c36eedf35c1198f75bec98a7604110ee109f5b15.tar.gz
samba-c36eedf35c1198f75bec98a7604110ee109f5b15.tar.bz2
samba-c36eedf35c1198f75bec98a7604110ee109f5b15.zip
r22571: - don't use "localhost" anymore in our tests
- use different passwords for dc and member metze (This used to be commit 9e882cbde232e5945c77eb162645328146023bee)
Diffstat (limited to 'source4')
-rw-r--r--source4/script/tests/Samba4.pm29
1 files changed, 18 insertions, 11 deletions
diff --git a/source4/script/tests/Samba4.pm b/source4/script/tests/Samba4.pm
index 0f2583021c..36550e35f3 100644
--- a/source4/script/tests/Samba4.pm
+++ b/source4/script/tests/Samba4.pm
@@ -449,18 +449,17 @@ moduleload syncprov
return ($slapd_conf, $pidfile);
}
-sub provision($$$$$)
+sub provision($$$$$$)
{
- my ($self, $prefix, $server_role, $domain, $netbiosname, $swiface) = @_;
+ my ($self, $prefix, $server_role, $netbiosname, $netbiosalias, $swiface, $password) = @_;
my $smbd_loglevel = 1;
my $username = "administrator";
+ my $domain = "SAMBADOMAIN";
my $realm = "SAMBA.EXAMPLE.COM";
my $dnsname = "samba.example.com";
my $basedn = "dc=samba,dc=example,dc=com";
- my $password = "penguin";
my $root = ($ENV{USER} or $ENV{LOGNAME} or `whoami`);
- my $server = "localhost";
my $srcdir="$RealBin/../..";
-d $prefix or mkdir($prefix, 0777) or die("Unable to create $prefix");
my $prefix_abs = abs_path($prefix);
@@ -490,7 +489,7 @@ sub provision($$$$$)
print CONFFILE "
[global]
netbios name = $netbiosname
- netbios aliases = $server
+ netbios aliases = $netbiosalias
workgroup = $domain
realm = $realm
private dir = $privatedir
@@ -616,10 +615,10 @@ sub provision($$$$$)
my $ret = {
KRB5_CONFIG => $krb5_config,
PIDDIR => $piddir,
- SERVER => $server,
+ SERVER => $netbiosname,
SERVER_IP => $ifaceipv4,
NETBIOSNAME => $netbiosname,
- NETBIOSALIAS => $server,
+ NETBIOSALIAS => $netbiosalias,
LDAP_URI => $ldap_uri,
DOMAIN => $domain,
USERNAME => $username,
@@ -662,8 +661,12 @@ sub provision_member($$$)
my ($self, $prefix, $dcvars) = @_;
print "PROVISIONING MEMBER...";
- my $ret = $self->provision($prefix, "member server", "SAMBADOMAIN",
- "localmember", 3);
+ my $ret = $self->provision($prefix,
+ "member server",
+ "localmember3",
+ "localmember",
+ 3,
+ "localmemberpass");
$ret or die("Unable to provision");
@@ -688,8 +691,12 @@ sub provision_dc($$)
my ($self, $prefix) = @_;
print "PROVISIONING DC...";
- my $ret = $self->provision($prefix, "domain controller", "SAMBADOMAIN",
- "localtest", 1);
+ my $ret = $self->provision($prefix,
+ "domain controller",
+ "localdc1",
+ "localdc",
+ 1,
+ "localdcpass");
$self->add_wins_config("$prefix/private") or
die("Unable to add wins configuration");