At file:///home/jelmer/bzr.samba/SAMBA_4_0/
------------------------------------------------------------
revno: 11879
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: SAMBA_4_0
timestamp: Tue 2007-04-17 01:13:08 +0200
message:
Don't add wins configuration, shares ldb, etc for member servers.
Remove shares testing code here (will readd in a slightly different fashion
later).
removed:
source/script/tests/mktestdc.sh.share_ldb svn-v2:[EMAIL PROTECTED]
modified:
source/script/tests/Samba4.pm svn-v2:[EMAIL PROTECTED]
=== removed file 'source/script/tests/mktestdc.sh.share_ldb'
--- a/source/script/tests/mktestdc.sh.share_ldb 2007-03-21 15:57:07 +0000
+++ b/source/script/tests/mktestdc.sh.share_ldb 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-SHARE_BACKEND="ldb"
-
-. `dirname $0`/mktestsetup.sh
=== modified file 'source/script/tests/Samba4.pm'
--- a/source/script/tests/Samba4.pm 2007-04-16 22:35:13 +0000
+++ b/source/script/tests/Samba4.pm 2007-04-16 23:13:08 +0000
@@ -135,11 +135,34 @@
system("bin/nmblookup $testenv_vars->{CONFIGURATION} -U
$testenv_vars->{SERVER} $testenv_vars->{NETBIOSNAME}");
}
+sub write_ldb_file($$$)
+{
+ my ($self, $file, $ldif) = @_;
+
+ open(LDIF, "|$self->{bindir}/ldbadd -H $file >/dev/null");
+ print LDIF $ldif;
+ return close(LDIF);
+}
+
+sub add_wins_config($$)
+{
+ my ($self, $privatedir) = @_;
+
+ return $self->write_ldb_file("$privatedir/wins_config.ldb", "
+dn: name=TORTURE_6,CN=PARTNERS
+objectClass: wreplPartner
+name: TORTURE_6
+address: 127.0.0.6
+pullInterval: 0
+pushChangeCount: 0
+type: 0x3
+");
+}
+
sub provision($$$$$$)
{
my ($self, $prefix, $server_role, $domain, $netbiosname, $ldap) = @_;
- my $share_backend = "classic";
my $smbd_loglevel = 1;
my $username = "administrator";
my $realm = "SAMBA.EXAMPLE.COM";
@@ -182,7 +205,6 @@
pid directory = $piddir
ncalrpc dir = $ncalrpcdir
lock dir = $lockdir
- share backend = $share_backend
setup directory = $self->{setupdir}
js include = $srcdir/scripting/libjs
winbindd socket directory = $winbindd_socket_dir
@@ -228,87 +250,6 @@
";
close(CONFFILE);
- ## Override default share.ldb file
- unlink("$privatedir/share.ldb");
- open(LDIF, ">$privatedir/share.ldif");
- print LDIF "
-### Shares basedn
-dn: [EMAIL PROTECTED]
[EMAIL PROTECTED]: name
-
-dn: [EMAIL PROTECTED]
-cn: CASE_INSENSITIVE
-dc: CASE_INSENSITIVE
-name: CASE_INSENSITIVE
-dn: CASE_INSENSITIVE
-objectClass: CASE_INSENSITIVE
-
-dn: CN=Shares
-objectClass: top
-objectClass: organizationalUnit
-cn: Shares
-
-### Default IPC\$ Share
-dn: CN=IPC\$,CN=Shares
-objectClass: top
-objectClass: share
-cn: IPC\$
-name: IPC\$
-type: IPC
-path: /tmp
-comment: Remote IPC
-max-connections: -1
-available: True
-readonly: True
-browseable: False
-ntvfs-handler: default
-
-### Default ADMIN\$ Share
-dn: CN=ADMIN\$,CN=Shares
-objectClass: top
-objectClass: share
-cn: ADMIN\$
-name: ADMIN\$
-type: DISK
-path: /tmp
-comment: Remote Admin
-max-connections: -1
-available: True
-readonly: True
-browseable: False
-ntvfs-handler: default
-
-dn: CN=tmp,CN=Shares
-objectClass: top
-objectClass: share
-cn: tmp
-name: tmp
-type: DISK
-path: $tmpdir
-comment: Temp Dir for Tests
-readonly: False
-ntvfs-handler: posix
-posix-sharedelay: 100000
-posix-eadb: $lockdir/eadb.tdb
-
-dn: CN=cifs,CN=Shares
-objectClass: top
-objectClass: share
-cn: cifs
-name: cifs
-type: DISK
-readonly: False
-ntvfs-handler: cifs
-cifs-server: $server
-cifs-user: $username
-cifs-password: $password
-cifs-domain: $domain
-cifs-share: tmp
-";
- close(LDIF);
-
- system("$self->{bindir}/ldbadd -H $privatedir/share.ldb <
$privatedir/share.ldif >/dev/null") == 0 or die("Unable to add share ldif");
-
die ("Unable to create key blobs") if
(system("TLSDIR=$tlsdir $RealBin/mk-keyblobs.sh") != 0);
@@ -390,20 +331,6 @@
push (@provision_options, "--ldap-module=nsuniqueid");
}
- open(LDIF, ">$privatedir/wins_config.ldif");
- print LDIF "
-dn: name=TORTURE_6,CN=PARTNERS
-objectClass: wreplPartner
-name: TORTURE_6
-address: 127.0.0.6
-pullInterval: 0
-pushChangeCount: 0
-type: 0x3
-";
- close(LDIF);
-
- system("$self->{bindir}/ldbadd -H $privatedir/wins_config.ldb <
$privatedir/wins_config.ldif >/dev/null") == 0 or die("Unable to add wins
configuration");
-
return {
KRB5_CONFIG => $krb5_config,
PIDDIR => $piddir,
@@ -425,7 +352,7 @@
sub provision_member($$$)
{
my ($self, $prefix, $dcvars) = @_;
- print "PROVISIONING...";
+ print "PROVISIONING MEMBER...";
my $ret = $self->provision($prefix, "member server", "SAMBADOMAIN",
"localmember",
@@ -445,12 +372,15 @@
{
my ($self, $prefix) = @_;
- print "PROVISIONING...";
+ print "PROVISIONING DC...";
my $ret = $self->provision($prefix, "domain controller", "SAMBADOMAIN",
"localtest",
undef # LDAP
);
+ $self->add_wins_config("$prefix/private") or
+ die("Unable to add wins configuration");
+
$ret->{SMBD_TEST_FIFO} = "$prefix/smbd_test.fifo";
$ret->{SMBD_TEST_LOG} = "$prefix/smbd_test.log";
return $ret;
