svn commit: samba r22571 - in
branches/SAMBA_4_0/source/script/tests: .
metze at samba.org
metze at samba.org
Sun Apr 29 13:54:52 GMT 2007
Author: metze
Date: 2007-04-29 13:54:51 +0000 (Sun, 29 Apr 2007)
New Revision: 22571
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22571
Log:
- don't use "localhost" anymore in our tests
- use different passwords for dc and member
metze
Modified:
branches/SAMBA_4_0/source/script/tests/Samba4.pm
Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/Samba4.pm
===================================================================
--- branches/SAMBA_4_0/source/script/tests/Samba4.pm 2007-04-29 13:31:13 UTC (rev 22570)
+++ branches/SAMBA_4_0/source/script/tests/Samba4.pm 2007-04-29 13:54:51 UTC (rev 22571)
@@ -449,18 +449,17 @@
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 @@
print CONFFILE "
[global]
netbios name = $netbiosname
- netbios aliases = $server
+ netbios aliases = $netbiosalias
workgroup = $domain
realm = $realm
private dir = $privatedir
@@ -616,10 +615,10 @@
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 @@
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 @@
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");
More information about the samba-cvs
mailing list