[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Tue May 1 18:52:04 MDT 2012
The branch, master has been updated
via 5763301 selftest: run more raw.samba3 against secshare simple file server
via 6d87df2 selftest: Run smbtorture tests being run against s3dc against plugin_s4_dc as well
via 53c70be selftest: Do not start samba4 srvsvc in plugin_s4_dc mode
via 45125a4 selftest: add hooks required for printing to Samba4.pm
via c65bc4a selftest: mark samba3.raw.samba3checkfsp as flapping on plugin_s4_dc
via c350422 selftest: mark samba3.raw.acls.inheritance(plugin_s4_dc) as flapping
via ecc0ac5 selftest: add knownfail entries for plugin_s4_dc tests
via 7905f97 selftest: change knownfail to cope with running plugin_s4_dc as well
via 33bf3ef file_server: use embedded srvsvc
via 2e1a4f6 file_server: Use the embedded winreg server
via c3be524 file_server: use embedded ntsvcs server
via cb5c456 file_server: use embedded eventlog server
via f956f04 file_server: forward dssetup, but use embedded svcctl for s3fs
via c0db57e selftest: Use same pattern for path to share as Samba3.pm
via 154518a selftest: Add hideunread share to plugin_s4_dc
via 99ce562 selftest: run plugin_s4_dc with 'acl_xattr xattr_tdb streams_depot' VFS modules
via 546318b selftest: prepare to run smbtorture tests against plugin_s4_dc
via 5baf113 selftest: attempt to test samba3hide in a different environment
via 5f07078 selftest: Enable ACL testing against the s3dc environment
via 221c0e4 s3-smbd: Use security_session_user_level() rather than nt_token_check_sid()
from d7f3c00 s3:torture fix flakey testcase
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 5763301e2622dd8016da4172a489bf7dbea33522
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue May 1 20:11:04 2012 +1000
selftest: run more raw.samba3 against secshare simple file server
This allows these tests to run in an environment where they can pass,
as they fail when ACL support is turned on in smbd.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet at samba.org>
Autobuild-Date: Wed May 2 02:51:27 CEST 2012 on sn-devel-104
commit 6d87df2ac3c00215a5cf23c8d452239124ac8358
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Apr 30 15:32:08 2012 +1000
selftest: Run smbtorture tests being run against s3dc against plugin_s4_dc as well
commit 53c70be468c805ad6d1459c1eb45de07d0008cbb
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue May 1 16:06:39 2012 +1000
selftest: Do not start samba4 srvsvc in plugin_s4_dc mode
commit 45125a459ab39b973de6536e1ffe4de63eb33170
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Apr 30 23:39:27 2012 +1000
selftest: add hooks required for printing to Samba4.pm
commit c65bc4aa92ccc3f202abec3e882493ca828b1967
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 2 07:19:13 2012 +1000
selftest: mark samba3.raw.samba3checkfsp as flapping on plugin_s4_dc
This fails on my Fedora 16 workstation, but passes on sn-devel.
Andrew Bartlett
commit c350422bfe6712eb67cf2f81450b31fcfd1a0a26
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue May 1 21:47:28 2012 +1000
selftest: mark samba3.raw.acls.inheritance(plugin_s4_dc) as flapping
This seems to succeed on sn-devel, but fails in a local make test on
my workstation.
Andrew Bartlett
commit ecc0ac5103705f93bbfa5f4d6a947ec34e54d408
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Apr 30 23:39:10 2012 +1000
selftest: add knownfail entries for plugin_s4_dc tests
commit 7905f974947e00eb9f90d0d5717e0538ab20c06d
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Apr 30 20:55:30 2012 +1000
selftest: change knownfail to cope with running plugin_s4_dc as well
commit 33bf3efe37623d218fb44e1c57622254d516b59f
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue May 1 16:06:25 2012 +1000
file_server: use embedded srvsvc
commit 2e1a4f63eb01559a64c7c406c935d3565eed18ce
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Apr 30 16:03:33 2012 +1000
file_server: Use the embedded winreg server
commit c3be5240e980c6bb523ba6ff95d5abf691ad2adf
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Apr 30 15:22:04 2012 +1000
file_server: use embedded ntsvcs server
commit cb5c456d47b0699a03d9ad7eb7119b6f4d61721d
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Apr 30 15:19:43 2012 +1000
file_server: use embedded eventlog server
commit f956f04dd1a552913a05411f167795b61f615b40
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Apr 30 15:13:49 2012 +1000
file_server: forward dssetup, but use embedded svcctl for s3fs
commit c0db57e748ce77908382281b4ce51bcf8d7064ec
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Apr 30 15:08:38 2012 +1000
selftest: Use same pattern for path to share as Samba3.pm
This helps as we declare tests that were previously targetted at Samba3 only.
Andrew Bartlett
commit 154518a719b283153c29f728f11a704b07be85e6
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Apr 30 15:17:54 2012 +1000
selftest: Add hideunread share to plugin_s4_dc
commit 99ce5626dcd09273a8318fcea41612bb27f4286c
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Apr 30 15:16:15 2012 +1000
selftest: run plugin_s4_dc with 'acl_xattr xattr_tdb streams_depot' VFS modules
commit 546318b879242229fa34460cdfe3e123375c5df7
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Apr 26 15:20:02 2012 +1000
selftest: prepare to run smbtorture tests against plugin_s4_dc
commit 5baf11307fb2e95b2bfb05e8b74ca502cf3073ae
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Apr 18 16:05:22 2012 +1000
selftest: attempt to test samba3hide in a different environment
This should ensure that the samba3hide test is still run and passes,
in a non-ACLed environment.
Andrew Bartlett
commit 5f0707801a183a7cf32aebf6e47ca63d536be2ab
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Apr 17 11:56:23 2012 +1000
selftest: Enable ACL testing against the s3dc environment
Previously, ACL tests were skipped and the correct modules for ACL
testing were not loaded.
The addition of a knownfail entry for raw.samba3* tests is due to an
inconsitancy between the behaviour with and without ACL modules loaded
- posix chown calls appear to be ignored in this mode.
Andrew Bartlett
commit 221c0e479d99b81f8becd51d641a5979e420efdc
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue May 1 17:13:34 2012 +1000
s3-smbd: Use security_session_user_level() rather than nt_token_check_sid()
This allows the unix.whoami test to pass when configured as part of the AD DC.
The struct auth_session_info is slightly different in the AD DC configuration
when using auth_samba4. In particular, there is a distinction between Guest
and Anonymous logins.
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
file_server/file_server.c | 6 ++-
selftest/flapping | 6 ++
selftest/knownfail | 122 +++++++++++++++++++++++++++++++++++++++++---
selftest/skip | 1 -
selftest/target/Samba3.pm | 4 +-
selftest/target/Samba4.pm | 105 ++++++++++++++++++++++++++++++---------
source3/selftest/tests.py | 11 +++-
source3/smbd/trans2.c | 14 +-----
8 files changed, 219 insertions(+), 50 deletions(-)
Changeset truncated at 500 lines:
diff --git a/file_server/file_server.c b/file_server/file_server.c
index ad05fca..c28acae 100644
--- a/file_server/file_server.c
+++ b/file_server/file_server.c
@@ -52,7 +52,11 @@ static const char *generate_smb_conf(struct task_server *task)
fdprintf(fd, "auth methods = guest samba4\n");
fdprintf(fd, "passdb backend = samba4\n");
fdprintf(fd, "rpc_server:default = external\n");
- fdprintf(fd, "rpc_server:dssetup = disabled\n");
+ fdprintf(fd, "rpc_server:svcctl = embedded\n");
+ fdprintf(fd, "rpc_server:srvsvc = embedded\n");
+ fdprintf(fd, "rpc_server:eventlog = embedded\n");
+ fdprintf(fd, "rpc_server:ntsvcs = embedded\n");
+ fdprintf(fd, "rpc_server:winreg = embedded\n");
fdprintf(fd, "rpc_server:spoolss = embedded\n");
fdprintf(fd, "rpc_daemon:spoolssd = disabled\n");
fdprintf(fd, "rpc_server:tcpip = no\n");
diff --git a/selftest/flapping b/selftest/flapping
index fbd38af..7fd2cae 100644
--- a/selftest/flapping
+++ b/selftest/flapping
@@ -17,3 +17,9 @@
^samba3.rpc.spoolss.printer.*addprinter.print_test # fails on some hosts due to timing issues ?
^samba3.smb2.lock.*.rw-exclusive # another intermittent failure
^samba4.blackbox.gentest # is flakey due to timing
+^samba3.smb2.acls.INHERITANCE\(plugin_s4_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
+^samba3.smb2.acls.DYNAMIC\(plugin_s4_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
+^samba3.raw.acls.dynamic\(plugin_s4_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
+^samba3.raw.acls.inheritance\(plugin_s4_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
+^samba3.raw.samba3checkfsp.samba3checkfsp\(plugin_s4_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
+^samba3.raw.samba3closeerr.samba3closeerr\(plugin_s4_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
diff --git a/selftest/knownfail b/selftest/knownfail
index 440304f..04ed622 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -19,7 +19,7 @@
^samba3.smbtorture_s3.plain\(dc\).NTTRANS-FSCTL # Fails against the s4 ntvfs server
^samba3.smbtorture_s3.plain\(dc\).SMB2-NEGPROT # Fails against the s4 ntvfs server
^samba3.smbtorture_s3.plain\(dc\).BAD-NBT-SESSION # Fails against the s4 ntvfs server
-^samba3.nbt.dgram.*netlogon2
+^samba3.nbt.dgram.*netlogon2\(s3dc\)
^samba3.*rap.sam.*.useradd # Not provided by Samba 3
^samba3.*rap.sam.*.userdelete # Not provided by Samba 3
^samba3.libsmbclient.opendir # This requires a workgroup called 'WORKGROUP' and for netbios browse lists to have been registered
@@ -35,7 +35,10 @@
^samba3.blackbox.rpcclient over ncacn_np with \[spnego,smb2,bigendian\]
^samba3.blackbox.rpcclient over ncacn_np with \[spnego,connect,smb2\]
^samba3.blackbox.rpcclient over ncacn_np with \[spnego,connect,smb2,bigendian\]
-^samba3.raw.composite.appendacl\(s3dc\)# This needs ACL and IDMAP behaviour that smbd cannot provide, including mapping of arbitary sids.
+^samba3.raw.samba3hide.samba3hide\((s3dc|plugin_s4_dc)\) # This test fails against an smbd environment with NT ACLs enabled
+^samba3.raw.samba3checkfsp.samba3checkfsp\(s3dc\) # This test fails against an smbd environment with NT ACLs enabled
+^samba3.raw.samba3closeerr.samba3closeerr\(s3dc\) # This test fails against an smbd environment with NT ACLs enabled
+^samba3.raw.acls.generic\(s3dc\) # This fails against smbd
# these show that we still have some differences between our system
# with our internal iconv because it passes except when we bypass our
# internal iconv modules
@@ -143,9 +146,6 @@
^samba3.smb2.create.blob
^samba3.smb2.create.open
^samba3.smb2.create.leading-slash
-^samba3.smb2.create.aclfile
-^samba3.smb2.create.acldir
-^samba3.smb2.create.nulldacl
^samba3.smb2.notify.valid-req
^samba3.smb2.notify.dir
^samba3.smb2.notify.rec
@@ -179,12 +179,8 @@
^samba3.smb2.lease.multibreak
^samba3.smb2.oplock.batch12
^samba3.smb2.oplock.batch20
-^samba3.smb2.acls.CREATOR
^samba3.smb2.acls.GENERIC
-^samba3.smb2.acls.OWNER
-^samba3.smb2.acls.INHERITANCE
^samba3.smb2.acls.INHERITFLAGS
-^samba3.smb2.acls.DYNAMIC
^samba3.smb2.streams.rename
^samba3.smb2.streams.rename2
^samba3.smb2.streams.attributes
@@ -194,3 +190,111 @@
^samba3.smb2.session.reauth
^samba3.rpc.spoolss.printer.*addprinter.driver_info_winreg # knownfail or flapping?
^samba3.rpc.spoolss.printer.*addprinterex.driver_info_winreg # knownfail or flapping?
+#
+# The following tests fail against plugin_s4_dc (aka s3fs) currently.
+# These need to be examined and either fixed or correctly categorised.
+# but in the interests of ensuring we do not regress, we run the tests
+# and list the current failures here.
+#
+^samba3.raw.acls.create_file\(plugin_s4_dc\)
+^samba3.raw.acls.create_dir\(plugin_s4_dc\)
+^samba3.raw.acls.generic\(plugin_s4_dc\)
+^samba3.smb2.create.aclfile\(plugin_s4_dc\)
+^samba3.smb2.create.acldir\(plugin_s4_dc\)
+^samba3.rpc.eventlog.eventlog.GetLogIntormation\(plugin_s4_dc\)
+^samba3.rpc.eventlog.eventlog.FlushEventLog\(plugin_s4_dc\)
+^samba3.rpc.eventlog.eventlog.ReportEventLog\(plugin_s4_dc\)
+^samba3.rpc.eventlog.eventlog.ReadEventLog\(plugin_s4_dc\)
+^samba3.rpc.eventlog.eventlog.GetNumRecords\(plugin_s4_dc\)
+^samba3.rpc.eventlog.eventlog.OpenEventLog\(plugin_s4_dc\)
+^samba3.rap.basic.netsessiongetinfo\(plugin_s4_dc\)
+#
+# The spoolss bugs are due (at least in part) to missing configuration
+# in Samba4.pm. We want printing working in Samba 4.0, so these need
+# to be fixed one way or the other.
+#
+^samba3.rpc.spoolss.printserver.printserver.openprinter_badnamelist\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printserver.printserver.printer_data_list\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printserver.printserver.enum_forms\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printserver.printserver.forms\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printserver.printserver.forms_winreg\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printserver.printserver.enum_ports\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printserver.printserver.add_port\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printserver.printserver.get_printer_driver_directory\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printserver.printserver.get_print_processor_directory\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printserver.printserver.enum_printer_drivers\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printserver.printserver.enum_monitors\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printserver.printserver.enum_print_processors\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printserver.printserver.print_processors_winreg\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printserver.printserver.enum_printprocdata\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printserver.printserver.enum_printers\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printserver.printserver.enum_ports_old\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printserver.printserver.enum_printers_servername\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printserver.printserver.enum_printer_drivers_old\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printserver.printserver.architecture_buffer\(plugin_s4_dc\)
+^samba3.rpc.spoolss.win.win.testWinXP\(plugin_s4_dc\)
+^samba3.rpc.spoolss.notify.notify.testReplyOpenPrinter\(plugin_s4_dc\)
+^samba3.rpc.spoolss.notify.notify.testRFFPCNEx\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinter.openprinter\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinter.csetprinter\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinter.printer_info\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinter.sd\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinter.dm\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinter.printer_info_winreg\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinter.change_id\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinter.keys\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinter.printerdata_consistency\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinter.printerdata_keys\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinter.printerdata_values\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinter.printerdata_set\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinter.printerdata_winreg\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinter.printerdata_dsspooler\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinter.printer_rename\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinterex.openprinter\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinterex.csetprinter\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinterex.printer_info\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinterex.sd\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinterex.dm\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinterex.printer_info_winreg\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinterex.change_id\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinterex.keys\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinterex.printerdata_consistency\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinterex.printerdata_keys\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinterex.printerdata_values\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinterex.printerdata_set\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinterex.printerdata_winreg\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinterex.printerdata_dsspooler\(plugin_s4_dc\)
+^samba3.rpc.spoolss.printer.addprinterex.printer_rename\(plugin_s4_dc\)
+^samba3.rpc.spoolss.driver.driver.del_driver_unused_files\(plugin_s4_dc\)
+^samba3.rpc.spoolss.driver.driver.del_driver_all_files\(plugin_s4_dc\)
+^samba3.rpc.spoolss.driver.driver.multiple_drivers\(plugin_s4_dc\)
+^samba3.rpc.spoolss.driver.driver.add_driver_adobe_cupsaddsmb\(plugin_s4_dc\)
+^samba3.rpc.spoolss.driver.driver.add_driver_adobe\(plugin_s4_dc\)
+^samba3.rpc.spoolss.driver.driver.add_driver_ex_32\(plugin_s4_dc\)
+^samba3.rpc.spoolss.driver.driver.add_driver_32\(plugin_s4_dc\)
+^samba3.rpc.spoolss.driver.driver.add_driver_ex_64\(plugin_s4_dc\)
+^samba3.rpc.spoolss.driver.driver.add_driver_64\(plugin_s4_dc\)
+#
+# The Samba4 netlogon server does not implement these LogonControl operations
+#
+^samba3.rpc.netlogon.admin.netlogon.LogonControl2\(plugin_s4_dc\)
+^samba3.rpc.netlogon.admin.netlogon.LogonControl\(plugin_s4_dc\)
+^samba3.rpc.netlogon.admin.netlogon.LogonControl2\(plugin_s4_dc\)
+^samba3.rpc.netlogon.admin.netlogon.LogonControl\(plugin_s4_dc\)
+^samba3.rpc.netlogon.admin.netlogon.LogonControl2\(plugin_s4_dc\)
+^samba3.rpc.netlogon.admin.netlogon.LogonControl\(plugin_s4_dc\)
+#
+# The Samba4 winbind does not cover the full winbind protocol, so these are expected
+#
+^samba3.winbind.struct.info\(plugin_s4_dc\)
+^samba3.winbind.struct.show_sequence\(plugin_s4_dc\)
+^samba3.winbind.wbclient.wbcPingDc\(plugin_s4_dc\)
+^samba3.winbind.wbclient.wbcListTrusts\(plugin_s4_dc\)
+^samba3.winbind.wbclient.wbcLookupDomainController\(plugin_s4_dc\)
+^samba3.winbind.wbclient.wbcLookupDomainControllerEx\(plugin_s4_dc\)
+^samba3.winbind.wbclient.wbcResolveWinsByName\(plugin_s4_dc\)
+^samba3.winbind.wbclient.wbcResolveWinsByIP\(plugin_s4_dc\)
+^samba3.winbind.wbclient.wbcLookupRids\(plugin_s4_dc\)
+^samba3.winbind.wbclient.wbcGetSidAliases\(plugin_s4_dc\)
+^samba3.winbind.wbclient.wbcLogonUser\(plugin_s4_dc\)
+^samba3.winbind.wbclient.wbcChangeUserPassword\(plugin_s4_dc\)
diff --git a/selftest/skip b/selftest/skip
index 68a32a6..f2f6b69 100644
--- a/selftest/skip
+++ b/selftest/skip
@@ -34,7 +34,6 @@
^samba3.smbtorture_s3.*.pipe_number
^samba3.smbtorture_s3.LOCAL-DBTRANS #hangs for some reason
^samba3.*base.charset
-^samba3.*raw.acls
^samba3.*raw.context
^samba3.*raw.ioctl
^samba3.*raw.qfileinfo
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 077e600..b148167 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -347,12 +347,14 @@ sub setup_admember($$$$)
sub setup_secshare($$)
{
my ($self, $path) = @_;
+ my $vfs_modulesdir_abs = $ENV{VFSLIBDIR};
print "PROVISIONING server with security=share...";
my $secshare_options = "
security = share
lanman auth = yes
+ vfs objects = $vfs_modulesdir_abs/xattr_tdb.so $vfs_modulesdir_abs/streams_depot.so
";
my $vars = $self->provision($path,
@@ -941,7 +943,7 @@ sub provision($$$$$$)
store dos attributes = yes
create mask = 755
dos filemode = yes
- vfs objects = $vfs_modulesdir_abs/xattr_tdb.so $vfs_modulesdir_abs/streams_depot.so
+ vfs objects = $vfs_modulesdir_abs/acl_xattr.so $vfs_modulesdir_abs/xattr_tdb.so $vfs_modulesdir_abs/streams_depot.so
printing = vlp
print command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb print %p %s
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index bc469d7..b94abdb 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -680,7 +680,7 @@ nogroup:x:65534:nobody
SAMBA_TEST_LOG => "$ctx->{prefix}/samba_test.log",
SAMBA_TEST_LOG_POS => 0,
NSS_WRAPPER_WINBIND_SO_PATH => Samba::bindir_path($self, "default/nsswitch/libnss-winbind.so"),
- LOCAL_PATH => $ctx->{tmpdir}
+ LOCAL_PATH => $ctx->{share}
};
return $ret;
@@ -706,17 +706,17 @@ sub provision($$$$$$$$)
{
my ($self, $prefix, $server_role, $hostname,
$domain, $realm, $functional_level,
- $password, $kdc_ipv4, $extra_smbconf_options) = @_;
+ $password, $kdc_ipv4, $extra_smbconf_options, $extra_smbconf_shares) = @_;
my $ctx = $self->provision_raw_prepare($prefix, $server_role,
$hostname,
$domain, $realm, $functional_level,
$password, $kdc_ipv4);
- $ctx->{tmpdir} = "$ctx->{prefix_abs}/tmp";
- push(@{$ctx->{directories}}, "$ctx->{tmpdir}");
- push(@{$ctx->{directories}}, "$ctx->{tmpdir}/test1");
- push(@{$ctx->{directories}}, "$ctx->{tmpdir}/test2");
+ $ctx->{share} = "$ctx->{prefix_abs}/share";
+ push(@{$ctx->{directories}}, "$ctx->{share}");
+ push(@{$ctx->{directories}}, "$ctx->{share}/test1");
+ push(@{$ctx->{directories}}, "$ctx->{share}/test2");
my $msdfs = "no";
$msdfs = "yes" if ($server_role eq "domain controller");
$ctx->{smb_conf_extra_options} = "
@@ -729,14 +729,14 @@ sub provision($$$$$$$$)
$extra_smbconf_options
[tmp]
- path = $ctx->{tmpdir}
+ path = $ctx->{share}
read only = no
posix:sharedelay = 10000
posix:oplocktimeout = 3
posix:writetimeupdatedelay = 50000
[xcopy_share]
- path = $ctx->{tmpdir}
+ path = $ctx->{share}
read only = no
posix:sharedelay = 10000
posix:oplocktimeout = 3
@@ -745,14 +745,14 @@ sub provision($$$$$$$$)
force create mode = 777
[test1]
- path = $ctx->{tmpdir}/test1
+ path = $ctx->{share}/test1
read only = no
posix:sharedelay = 10000
posix:oplocktimeout = 3
posix:writetimeupdatedelay = 50000
[test2]
- path = $ctx->{tmpdir}/test2
+ path = $ctx->{share}/test2
read only = no
posix:sharedelay = 10000
posix:oplocktimeout = 3
@@ -769,7 +769,7 @@ sub provision($$$$$$$$)
# Or the server tries s4u2self/s4u2proxy to impersonate the client
[simple]
- path = $ctx->{tmpdir}
+ path = $ctx->{share}
read only = no
ntvfs handler = simple
@@ -784,6 +784,8 @@ sub provision($$$$$$$$)
[cifsposix]
copy = simple
ntvfs handler = cifsposix
+
+$extra_smbconf_shares
";
if (defined($self->{ldap})) {
@@ -838,7 +840,7 @@ sub provision_member($$$)
"2008",
"locMEMpass3",
$dcvars->{SERVER_IP},
- "");
+ "", "");
unless ($ret) {
return undef;
}
@@ -903,7 +905,7 @@ sub provision_rpc_proxy($$$)
"2008",
"locRPCproxypass4",
$dcvars->{SERVER_IP},
- $extra_smbconf_options);
+ $extra_smbconf_options, "");
unless ($ret) {
return undef;
@@ -1099,7 +1101,7 @@ allow dns updates = True";
"samba.example.com",
"2008",
"locDCpass1",
- undef, $extra_conf_options);
+ undef, $extra_conf_options, "");
return undef unless(defined $ret);
unless($self->add_wins_config("$prefix/private")) {
@@ -1150,7 +1152,7 @@ sub provision_fl2003dc($$)
"samba2003.example.com",
"2003",
"locDCpass6",
- undef, "");
+ undef, "", "");
unless($self->add_wins_config("$prefix/private")) {
warn("Unable to add wins configuration");
@@ -1172,7 +1174,7 @@ sub provision_fl2008r2dc($$)
"samba2008R2.example.com",
"2008_R2",
"locDCpass7",
- undef, "");
+ undef, "", "");
unless ($self->add_wins_config("$prefix/private")) {
warn("Unable to add wins configuration");
@@ -1200,8 +1202,8 @@ sub provision_rodc($$$)
return undef;
}
- $ctx->{tmpdir} = "$ctx->{prefix_abs}/tmp";
- push(@{$ctx->{directories}}, "$ctx->{tmpdir}");
+ $ctx->{share} = "$ctx->{prefix_abs}/share";
+ push(@{$ctx->{directories}}, "$ctx->{share}");
$ctx->{smb_conf_extra_options} = "
max xmit = 32K
@@ -1216,7 +1218,7 @@ sub provision_rodc($$$)
read only = yes
[tmp]
- path = $ctx->{tmpdir}
+ path = $ctx->{share}
read only = no
posix:sharedelay = 10000
posix:oplocktimeout = 3
@@ -1265,10 +1267,66 @@ sub provision_plugin_s4_dc($$)
{
my ($self, $prefix) = @_;
+ my $prefix_abs = abs_path($prefix);
+
+ my $bindir_abs = abs_path($self->{bindir});
+ my $lockdir="$prefix_abs/lockdir";
+
my $extra_smbconf_options = "
-server services = -smb +s3fs
-dcerpc endpoint servers = -unixinfo -spoolss -winreg -wkssvc -srvsvc
-xattr_tdb:file = $prefix/statedir/xattr.tdb
+ server services = -smb +s3fs
+ xattr_tdb:file = $prefix_abs/statedir/xattr.tdb
+
+ kernel oplocks = no
+ kernel change notify = no
+
+ syslog = no
+ printing = bsd
+ printcap name = /dev/null
+
+ max protocol = SMB2
+ read only = no
+ server signing = auto
+
+ smbd:sharedelay = 100000
+ smbd:writetimeupdatedelay = 500000
+ map hidden = no
+ map system = no
+ map readonly = no
+ store dos attributes = yes
+ create mask = 755
+ dos filemode = yes
+
+ vfs objects = acl_xattr xattr_tdb streams_depot
+
+ dcerpc endpoint servers = -winreg -srvsvc
+
+ printcap name = /dev/null
+
+ printing = vlp
+ print command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb print %p %s
+ lpq command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb lpq %p
+ lp rm command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb lprm %p %j
+ lp pause command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb lppause %p %j
+ lp resume command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb lpresume %p %j
+ queue pause command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb queuepause %p
+ queue resume command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb queueresume %p
+ lpq cache time = 0
+
+";
+
+ my $extra_smbconf_shares = "
+
+[tmpcase]
+ copy = tmp
+ case sensitive = yes
+
+[tmpguest]
+ copy = tmp
+ guest ok = yes
+
+[hideunread]
+ copy = tmp
+ hide unreadable = yes
";
print "PROVISIONING PLUGIN S4 DC...";
@@ -1279,7 +1337,8 @@ xattr_tdb:file = $prefix/statedir/xattr.tdb
"plugin.samba.example.com",
"2008",
"locDCpass1",
- undef, $extra_smbconf_options);
+ undef, $extra_smbconf_options,
+ $extra_smbconf_shares);
return undef unless(defined $ret);
unless($self->add_wins_config("$prefix/private")) {
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 8073e99..0682f8b 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -273,19 +273,26 @@ tests= base + raw + smb2 + rpc + unix + local + winbind + rap + nbt + libsmbclie
for t in tests:
if t == "base.delaywrite":
plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --maximum-runtime=900')
+ plansmbtorturetestsuite(t, "plugin_s4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --maximum-runtime=900')
elif t == "rap.sam":
plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --option=doscharset=ISO-8859-1')
+ plansmbtorturetestsuite(t, "plugin_s4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --option=doscharset=ISO-8859-1')
elif t == "unix.whoami":
plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmpguest -U$USERNAME%$PASSWORD')
+ plansmbtorturetestsuite(t, "plugin_s4_dc", '//$SERVER_IP/tmpguest -U$USERNAME%$PASSWORD')
elif t == "raw.samba3posixtimedlock":
plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmpguest -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/s3dc/share')
+ plansmbtorturetestsuite(t, "plugin_s4_dc", '//$SERVER_IP/tmpguest -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/plugin_s4_dc/share')
elif t == "raw.chkpath":
plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmpcase -U$USERNAME%$PASSWORD')
- elif t == "raw.composite":
+ plansmbtorturetestsuite(t, "plugin_s4_dc", '//$SERVER_IP/tmpcase -U$USERNAME%$PASSWORD')
+ elif t == "raw.samba3hide" or t == "raw.samba3checkfsp" or t == "raw.samba3closeerr":
plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
- plansmbtorturetestsuite(t, "plugin_s4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
+ plansmbtorturetestsuite(t, "secshare", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
+ plansmbtorturetestsuite(t, "plugin_s4_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
else:
plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
+ plansmbtorturetestsuite(t, "plugin_s4_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
test = 'rpc.lsa.lookupsids'
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 63ee76b..5cfbc31 100644
--- a/source3/smbd/trans2.c
--
Samba Shared Repository
More information about the samba-cvs
mailing list