if ($envname eq "s3dc") {
return $self->setup_s3dc("$path/s3dc");
- } elsif ($envname eq "secshare") {
- return $self->setup_secshare("$path/secshare");
+ } elsif ($envname eq "simpleserver") {
+ return $self->setup_simpleserver("$path/simpleserver");
} elsif ($envname eq "maptoguest") {
return $self->setup_maptoguest("$path/maptoguest");
} elsif ($envname eq "ktest") {
$vars or return undef;
- $self->check_or_start($vars,
- "yes", "yes", "yes");
-
- if (not $self->wait_for_start($vars)) {
+ if (not $self->check_or_start($vars, "yes", "yes", "yes")) {
return undef;
}
return undef;
}
- $self->check_or_start($ret, "yes", "yes", "yes");
-
- if (not $self->wait_for_start($ret)) {
+ if (not $self->check_or_start($ret, "yes", "yes", "yes")) {
return undef;
}
# access the share for tests.
chmod 0777, "$prefix/share";
- $self->check_or_start($ret,
- "yes", "yes", "yes");
-
- $self->wait_for_start($ret);
+ if (not $self->check_or_start($ret, "yes", "yes", "yes")) {
+ return undef;
+ }
$ret->{DC_SERVER} = $dcvars->{SERVER};
$ret->{DC_SERVER_IP} = $dcvars->{SERVER_IP};
return $ret;
}
-sub setup_secshare($$)
+sub setup_simpleserver($$)
{
my ($self, $path) = @_;
my $vfs_modulesdir_abs = $ENV{VFSLIBDIR};
my $prefix_abs = abs_path($path);
- my $secshare_options = "
- security = share
+ my $simpleserver_options = "
lanman auth = yes
vfs objects = $vfs_modulesdir_abs/xattr_tdb.so $vfs_modulesdir_abs/streams_depot.so
my $vars = $self->provision($path,
"LOCALSHARE4",
"local4pass",
- $secshare_options);
+ $simpleserver_options);
$vars or return undef;
- $self->check_or_start($vars, "yes", "no", "yes");
-
- if (not $self->wait_for_start($vars)) {
+ if (not $self->check_or_start($vars, "yes", "no", "yes")) {
return undef;
}
- $self->{vars}->{secshare} = $vars;
+ $self->{vars}->{simpleserver} = $vars;
return $vars;
}
# access the share for tests.
chmod 0777, "$prefix/share";
- $self->check_or_start($ret, "yes", "no", "yes");
-
- if (not $self->wait_for_start($ret)) {
+ if (not $self->check_or_start($ret, "yes", "no", "yes")) {
return undef;
}
return $ret;
$vars or return undef;
- $self->check_or_start($vars,
- "yes", "no", "yes");
-
- if (not $self->wait_for_start($vars)) {
+ if (not $self->check_or_start($vars, "yes", "no", "yes")) {
return undef;
}
close(STDIN_READER);
- return 0;
+ return $self->wait_for_start($env_vars, $nmbd, $winbindd, $smbd);
}
sub provision($$$$$$)
}
mkdir($_, 0777) foreach(@dirs);
+ ##
+ ## lockdir and piddir must be 0755
+ ##
+ chmod 0755, $lockdir;
+ chmod 0755, $piddir;
+
+
##
## create ro and msdfs share layout
##
my ($max_uid, $max_gid);
my ($uid_nobody, $uid_root, $uid_pdbtest);
- my ($gid_nobody, $gid_nogroup, $gid_root, $gid_domusers);
+ my ($gid_nobody, $gid_nogroup, $gid_root, $gid_domusers, $gid_domadmins);
if ($unix_uid < 0xffff - 2) {
$max_uid = 0xffff;
$gid_nogroup = $max_gid - 2;
$gid_root = $max_gid - 3;
$gid_domusers = $max_gid - 4;
+ $gid_domadmins = $max_gid - 5;
##
## create conffile
map system = no
map readonly = no
store dos attributes = yes
- create mask = 755
+ create mask = 0777
+ directory mask = 0777
dos filemode = yes
vfs objects = $vfs_modulesdir_abs/acl_xattr.so $vfs_modulesdir_abs/fake_acls.so $vfs_modulesdir_abs/xattr_tdb.so $vfs_modulesdir_abs/streams_depot.so
[ro-tmp]
path = $ro_shrdir
guest ok = yes
+[write-list-tmp]
+ path = $shrdir
+ read only = yes
+ write list = $unix_name
+[valid-users-tmp]
+ path = $shrdir
+ valid users = $unix_name
[msdfs-share]
path = $msdfs_shrdir
msdfs root = yes
[hideunwrite]
copy = tmp
hide unwriteable files = yes
+[durable]
+ copy = tmp
+ kernel share modes = no
+ kernel oplocks = no
+ posix locking = no
[print1]
copy = tmp
printable = yes
copy = print1
[print3]
copy = print1
+ default devmode = no
[lp]
copy = print1
[xcopy_share]
nogroup:x:$gid_nogroup:nobody
$unix_name-group:x:$unix_gids[0]:
domusers:X:$gid_domusers:
+domadmins:X:$gid_domadmins:
";
if ($unix_gids[0] != 0) {
print GROUP "root:x:$gid_root:";
}
print "DONE\n";
- open(HOSTS, ">>$ENV{SELFTEST_PREFIX}/dns_host_file") or die("Unable to open $ENV{SELFTEST_PREFIX}/dns_host_file");
- print HOSTS "A $server. $server_ip
-";
- close(HOSTS);
+ open(DNS_UPDATE_LIST, ">$prefix/dns_update_list") or die("Unable to open $$prefix/dns_update_list");
+ print DNS_UPDATE_LIST "A $server. $server_ip";
+ close(DNS_UPDATE_LIST);
+
+ if (system("$ENV{SRCDIR_ABS}/source4/scripting/bin/samba_dnsupdate --all-interfaces --use-file=$dns_host_file -s $conffile --update-list=$prefix/dns_update_list --no-substiutions --no-credentials") != 0) {
+ die "Unable to update hostname into $dns_host_file";
+ }
$ret{SERVER_IP} = $server_ip;
$ret{NMBD_TEST_LOG} = "$prefix/nmbd_test.log";
$ret{SOCKET_WRAPPER_DEFAULT_IFACE} = $swiface;
$ret{NSS_WRAPPER_PASSWD} = $nss_wrapper_passwd;
$ret{NSS_WRAPPER_GROUP} = $nss_wrapper_group;
- $ret{NSS_WRAPPER_WINBIND_SO_PATH} = $ENV{NSS_WRAPPER_WINBIND_SO_PATH};
- if (not defined($ret{NSS_WRAPPER_WINBIND_SO_PATH})) {
- $ret{NSS_WRAPPER_WINBIND_SO_PATH} = Samba::bindir_path($self, "default/nsswitch/libnss-winbind.so");
- }
+ $ret{NSS_WRAPPER_WINBIND_SO_PATH} = Samba::nss_wrapper_winbind_so_path($self);
$ret{LOCAL_PATH} = "$shrdir";
return \%ret;
}
-sub wait_for_start($$)
+sub wait_for_start($$$$$)
{
- my ($self, $envvars) = @_;
+ my ($self, $envvars, $nmbd, $winbindd, $smbd) = @_;
+ my $ret;
- # give time for nbt server to register its names
- print "delaying for nbt name registration\n";
- sleep(10);
- # This will return quickly when things are up, but be slow if we need to wait for (eg) SSL init
- my $nmblookup = Samba::bindir_path($self, "nmblookup3");
- system("$nmblookup $envvars->{CONFIGURATION} -U $envvars->{SERVER_IP} __SAMBA__");
- system("$nmblookup $envvars->{CONFIGURATION} __SAMBA__");
- system("$nmblookup $envvars->{CONFIGURATION} -U 127.255.255.255 __SAMBA__");
- system("$nmblookup $envvars->{CONFIGURATION} -U $envvars->{SERVER_IP} $envvars->{SERVER}");
- system("$nmblookup $envvars->{CONFIGURATION} $envvars->{SERVER}");
+ if ($nmbd eq "yes") {
+ # give time for nbt server to register its names
+ print "delaying for nbt name registration\n";
+ sleep(10);
+ # This will return quickly when things are up, but be slow if we need to wait for (eg) SSL init
+ my $nmblookup = Samba::bindir_path($self, "nmblookup3");
+ system("$nmblookup $envvars->{CONFIGURATION} -U $envvars->{SERVER_IP} __SAMBA__");
+ system("$nmblookup $envvars->{CONFIGURATION} __SAMBA__");
+ system("$nmblookup $envvars->{CONFIGURATION} -U 127.255.255.255 __SAMBA__");
+ system("$nmblookup $envvars->{CONFIGURATION} -U $envvars->{SERVER_IP} $envvars->{SERVER}");
+ system("$nmblookup $envvars->{CONFIGURATION} $envvars->{SERVER}");
+ }
- # make sure smbd is also up set
- print "wait for smbd\n";
+ if ($winbindd eq "yes") {
+ print "checking for winbindd\n";
+ my $count = 0;
+ do {
+ $ret = system("WINBINDD_SOCKET_DIR=" . $envvars->{WINBINDD_SOCKET_DIR} . " " . Samba::bindir_path($self, "wbinfo") . " -p");
+ if ($ret != 0) {
+ sleep(2);
+ }
+ $count++;
+ } while ($ret != 0 && $count < 10);
+ if ($count == 10) {
+ print "WINBINDD not reachable after 20 seconds\n";
+ teardown_env($self, $envvars);
+ return 0;
+ }
+ }
- my $count = 0;
- my $ret;
- do {
- $ret = system(Samba::bindir_path($self, "smbclient3") ." $envvars->{CONFIGURATION} -L $envvars->{SERVER} -U% -p 139");
- if ($ret != 0) {
- sleep(2);
+ if ($smbd eq "yes") {
+ # make sure smbd is also up set
+ print "wait for smbd\n";
+
+ my $count = 0;
+ do {
+ $ret = system(Samba::bindir_path($self, "smbclient3") ." $envvars->{CONFIGURATION} -L $envvars->{SERVER} -U% -p 139");
+ if ($ret != 0) {
+ sleep(2);
+ }
+ $count++
+ } while ($ret != 0 && $count < 10);
+ if ($count == 10) {
+ print "SMBD failed to start up in a reasonable time (20sec)\n";
+ teardown_env($self, $envvars);
+ return 0;
}
- $count++
- } while ($ret != 0 && $count < 10);
- if ($count == 10) {
- print "SMBD failed to start up in a reasonable time (20sec)\n";
- teardown_env($self, $envvars);
- return 0;
}
+
# Ensure we have domain users mapped.
$ret = system(Samba::bindir_path($self, "net") ." $envvars->{CONFIGURATION} groupmap add rid=513 unixgroup=domusers type=domain");
if ($ret != 0) {
return 1;
}
+ $ret = system(Samba::bindir_path($self, "net") ." $envvars->{CONFIGURATION} groupmap add rid=512 unixgroup=domadmins type=domain");
+ if ($ret != 0) {
+ return 1;
+ }
+
+ if ($winbindd eq "yes") {
+ # note: creating builtin groups requires winbindd for the
+ # unix id allocator
+ $ret = system("WINBINDD_SOCKET_DIR=" . $envvars->{WINBINDD_SOCKET_DIR} . " " . Samba::bindir_path($self, "net") ." $envvars->{CONFIGURATION} sam createbuiltingroup Users");
+ if ($ret != 0) {
+ print "Failed to create BUILTIN\\Users group\n";
+ return 0;
+ }
+ my $count = 0;
+ do {
+ system(Samba::bindir_path($self, "net") . " $envvars->{CONFIGURATION} cache flush");
+ $ret = system("WINBINDD_SOCKET_DIR=" . $envvars->{WINBINDD_SOCKET_DIR} . " " . Samba::bindir_path($self, "wbinfo") . " --sid-to-gid=S-1-5-32-545");
+ if ($ret != 0) {
+ sleep(2);
+ }
+ $count++;
+ } while ($ret != 0 && $count < 10);
+ if ($count == 10) {
+ print "WINBINDD not reachable after 20 seconds\n";
+ teardown_env($self, $envvars);
+ return 0;
+ }
+ }
print $self->getlog_env($envvars);
git.samba.org / samba.git / blobdiff