The branch, master has been updated
via 22eb6d7... selftest/Samba4: make the naming of passwords more
consistent
via f26c0e5... selftest/Samba4: let localfl2000dc use 127.0.0.5
via 8aed54a... selftest/Samba4: let localvampiredc use 127.0.0.2
via 6a0db03... selftest: use 127.0.0.11-16 for the client
via 1e8d025... selftest/Samba3: remove unused create_clientconf()
function
from 9e3511e... pidl/wscript: build manpages in build group 'final'
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 22eb6d7b6b57ff0bee99ea86ddec676e7faaab8a
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Jun 16 11:22:30 2010 +0200
selftest/Samba4: make the naming of passwords more consistent
metze
commit f26c0e545617ba336720cd8852f4f376f4062af5
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Jun 16 11:14:46 2010 +0200
selftest/Samba4: let localfl2000dc use 127.0.0.5
Now we have 127.0.0.6-10 available for more servers.
metze
commit 8aed54adbf1a87de833cd53e4bc9a4eab074128e
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Jun 16 11:13:28 2010 +0200
selftest/Samba4: let localvampiredc use 127.0.0.2
metze
commit 6a0db03c80275c00dc0fe7aff099f9b6cc2d113e
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Jun 16 11:02:48 2010 +0200
selftest: use 127.0.0.11-16 for the client
This gives more room for servers.
Note: socket_wrapper currently only supports 127.0.0.1-16
see MAX_WRAPPED_INTERFACES.
metze
commit 1e8d025a3cd1b326e9660a0a5b388e67fc2d172a
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Jun 16 11:00:29 2010 +0200
selftest/Samba3: remove unused create_clientconf() function
metze
-----------------------------------------------------------------------
Summary of changes:
selftest/selftest.pl | 14 +++++++-------
selftest/target/Samba3.pm | 33 ---------------------------------
selftest/target/Samba4.pm | 25 +++++++++++++------------
3 files changed, 20 insertions(+), 52 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 668afbe..b0296e1 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -540,12 +540,12 @@ foreach (@opt_include) {
push (@includes, read_test_regexes($_));
}
-my $interfaces = join(',', ("127.0.0.6/8",
- "127.0.0.7/8",
- "127.0.0.8/8",
- "127.0.0.9/8",
- "127.0.0.10/8",
- "127.0.0.11/8"));
+my $interfaces = join(',', ("127.0.0.11/8",
+ "127.0.0.12/8",
+ "127.0.0.13/8",
+ "127.0.0.14/8",
+ "127.0.0.15/8",
+ "127.0.0.16/8"));
my $conffile = "$prefix_abs/client/client.conf";
$ENV{SMB_CONF_PATH} = $conffile;
@@ -845,7 +845,7 @@ sub setup_env($)
SocketWrapper::set_default_iface($testenv_vars->{SOCKET_WRAPPER_DEFAULT_IFACE});
$ENV{SMB_CONF_PATH} = $testenv_vars->{SERVERCONFFILE};
} elsif ($option eq "client") {
- SocketWrapper::set_default_iface(6);
+ SocketWrapper::set_default_iface(11);
write_clientconf($conffile, $testenv_vars);
$ENV{SMB_CONF_PATH} = $conffile;
} else {
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 02dbbe0..6eeae21 100644
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -341,39 +341,6 @@ sub check_or_start($$$$$) {
return 0;
}
-sub create_clientconf($$$)
-{
- my ($self, $prefix, $domain) = @_;
-
- my $lockdir = "$prefix/locks";
- my $logdir = "$prefix/logs";
- my $piddir = "$prefix/pid";
- my $privatedir = "$prefix/private";
- my $conffile = "$prefix/smb.conf";
-
- my
$torture_interfaces='127.0.0.6/8,127.0.0.7/8,127.0.0.8/8,127.0.0.9/8,127.0.0.10/8,127.0.0.11/8';
- open(CONF, ">$conffile");
- print CONF "
-[global]
- workgroup = $domain
-
- private dir = $privatedir
- pid directory = $piddir
- lock directory = $lockdir
- log file = $logdir/log.\%m
- log level = 0
-
- name resolve order = bcast
-
- netbios name = TORTURE_6
- interfaces = $torture_interfaces
- panic action = $RealBin/gdb_backtrace \%d %\$(MAKE_TEST_BINARY)
-
- passdb backend = tdbsam
- ";
- close(CONF);
-}
-
sub provision($$$$$$)
{
my ($self, $prefix, $server, $swiface, $password, $extra_options) = @_;
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index c8dbf8a..cd88a93 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -199,10 +199,10 @@ sub add_wins_config($$)
my ($self, $privatedir) = @_;
return $self->write_ldb_file("$privatedir/wins_config.ldb", "
-dn: name=TORTURE_6,CN=PARTNERS
+dn: name=TORTURE_11,CN=PARTNERS
objectClass: wreplPartner
-name: TORTURE_6
-address: 127.0.0.6
+name: TORTURE_11
+address: 127.0.0.11
pullInterval: 0
pushChangeCount: 0
type: 0x3
@@ -844,7 +844,7 @@ sub provision_member($$$)
"samba.example.com",
"2008",
3,
- "locMEMpass0",
+ "locMEMpass3",
$dcvars->{SERVER_IP},
"");
@@ -894,7 +894,7 @@ sub provision_rpc_proxy($$$)
"samba.example.com",
"2008",
4,
- "locRPCproxypass0",
+ "locRPCproxypass4",
$dcvars->{SERVER_IP},
$extra_smbconf_options);
@@ -926,11 +926,12 @@ sub provision_vampire_dc($$$)
# We do this so that we don't run the provision. That's the job of
'net vampire'.
my $ctx = $self->provision_raw_prepare($prefix, "domain controller",
- "localvampiredc",
"localvampiredc5",
+ "localvampiredc2",
+ "localvampiredc",
"SAMBADOMAIN",
"samba.example.com",
"2008",
- 5, $dcvars->{PASSWORD},
+ 2, $dcvars->{PASSWORD},
$dcvars->{SERVER_IP});
$ctx->{smb_conf_extra_options} = "
@@ -988,7 +989,7 @@ sub provision_dc($$)
"samba.example.com",
"2008",
1,
- "locDCpass0",
+ "locDCpass1",
"127.0.0.1", "");
$self->add_wins_config("$prefix/private") or
@@ -1011,14 +1012,14 @@ sub provision_fl2000dc($$)
print "PROVISIONING DC...";
my $ret = $self->provision($prefix,
"domain controller",
- "localfl2000dc1",
+ "localfl2000dc5",
"localfl2000dc",
"SAMBA2000",
"samba2000.example.com",
"2000",
- 7,
- "locDCpass0",
- "127.0.0.7", "");
+ 5,
+ "locDCpass5",
+ "127.0.0.5", "");
$self->add_wins_config("$prefix/private") or
die("Unable to add wins configuration");
--
Samba Shared Repository
