Andrew Bartlett [Mon, 5 Mar 2012 03:52:36 +0000 (14:52 +1100)]
selftest: Reduce declarations of smbclient_auth tests by moving into a loop
Andrew Bartlett [Mon, 5 Mar 2012 03:28:15 +0000 (14:28 +1100)]
selftest: run smbtorture_s3 tests against the ntvfs file server
This checks not only the behaviour of the NTVFS file server, but also the
client library and authentication stack.
Andrew Bartlett
Andrew Bartlett [Mon, 5 Mar 2012 00:12:00 +0000 (11:12 +1100)]
selftest: Reduce time in cleanup loop, try waitpid on all 3 children
Andrew Bartlett [Sun, 4 Mar 2012 23:46:23 +0000 (10:46 +1100)]
selftest: start to run more dcerpc tests against plugin_s4_dc
Andrew Bartlett [Sun, 4 Mar 2012 23:34:30 +0000 (10:34 +1100)]
selftest: forward rpcecho to Samba4 in plugin_s4_dc
Jelmer Vernooij [Mon, 5 Mar 2012 03:05:35 +0000 (04:05 +0100)]
selftest.run: Factor out read_testlist_file and open_file_or_pipe.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Mon Mar 5 05:42:19 CET 2012 on sn-devel-104
Jelmer Vernooij [Mon, 5 Mar 2012 02:49:50 +0000 (03:49 +0100)]
selftest.run: Factor out exported_envvars_str.
Jelmer Vernooij [Mon, 5 Mar 2012 02:45:57 +0000 (03:45 +0100)]
selfclient.client: Factor out write_clientconf.
Jelmer Vernooij [Mon, 5 Mar 2012 02:39:57 +0000 (03:39 +0100)]
selftest.run: Factor out expand_command_run.
Jelmer Vernooij [Mon, 5 Mar 2012 02:27:40 +0000 (03:27 +0100)]
selftest.run: Factor out expand_command_list.
Jelmer Vernooij [Mon, 5 Mar 2012 02:20:13 +0000 (03:20 +0100)]
selftest: Factor out expand_environment_strings.
Amitay Isaacs [Tue, 21 Feb 2012 06:30:53 +0000 (17:30 +1100)]
s3-ctdb: Enable CTDB readonly support only if CTDB supports it
Autobuild-User: Amitay Isaacs <amitay@samba.org>
Autobuild-Date: Mon Mar 5 02:47:36 CET 2012 on sn-devel-104
Rusty Russell [Fri, 3 Feb 2012 00:00:54 +0000 (11:00 +1100)]
dbwrap_ctdb: only fetch a read-only copy if we had a record already.
Because revoking read-only copies of records is expensive, we only
want ctdbd to do it for high-turnover records. A basic heuristic is
that if we don't find a local copy of the record, don't ask for a
read-only copy.
The fetch itself will cause ctdbd to migrate the record, so eventually
we will have a local copy. Next time it gets migrated away, we'll
call ctdbd_fetch() with local_copy = true.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Rusty Russell [Thu, 2 Feb 2012 23:54:53 +0000 (10:54 +1100)]
ctdbd_conn: fetch read-only copies of records.
This means we try to get a read-only copy of a record, which we can
then place in the local tdb.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Rusty Russell [Thu, 2 Feb 2012 23:53:27 +0000 (10:53 +1100)]
dbwrap_ctdb: handle read-only records.
The new read-only record flags make determining if we can use a record
a bit more complex, so extract it into its own function.
The OLD logic was:
1) If the record doesn't exist, we can't use it.
2) If we are the dmaster for the record, we can use it.
The new logic is:
1) If the record doesn't exist, we can't use it.
2) If we are the dmaster for the record, we can use it IF we only
want read-only access, OR there are no read-only delegations.
3) If we are not dmaster, we can only use it if we want read-only
access and it is marked as a read-only copy.
This logic is unused until the next patches which begin to ask
for read-only copies of records.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Andrew Bartlett [Fri, 2 Mar 2012 02:37:49 +0000 (13:37 +1100)]
selftest: remove unused config.h check
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Mon Mar 5 01:10:01 CET 2012 on sn-devel-104
Andrew Bartlett [Sun, 4 Mar 2012 20:47:50 +0000 (07:47 +1100)]
s3-smbd: vuser and session_info cannot be NULL here
The callers always supply it. (this is a hold-over from the
security=share removal).
Andrew Bartlett
Andrew Bartlett [Fri, 2 Mar 2012 05:11:55 +0000 (16:11 +1100)]
s3-rpc_server: consolidate rpc server init routines
This uses a helper function to reduce duplication.
Andrew Bartlett
Andrew Bartlett [Fri, 3 Feb 2012 07:19:36 +0000 (18:19 +1100)]
s3-auth Add make_session_info_from_pw to avoid multiple getpwnam() calls
Andrew Bartlett [Fri, 3 Feb 2012 07:03:10 +0000 (18:03 +1100)]
s3-auth: Remove security=share (depricated since 3.6).
This patch removes security=share, which Samba implemented by matching
the per-share password provided by the client in the Tree Connect with
a selection of usernames supplied by the client, the smb.conf or
guessed from the environment.
The rationale for the removal is that for the bulk of security=share
users, we just we need a very simple way to run a 'trust the network'
Samba server, where users mark shares as guest ok. This is still
supported, and the smb.conf options are documented at
https://wiki.samba.org/index.php/Public_Samba_Server
At the same time, this closes the door on one of the most arcane areas
of Samba authentication.
Naturally, full user-name/password authentication remain available in
security=user and above.
This includes documentation updates for username and only user, which
now only do a small amount of what they used to do.
Andrew Bartlett
--------------
/ \
/ REST \
/ IN \
/ PEACE \
/ \
| SEC_SHARE |
| security=share |
| |
| |
| 5 March |
| |
| 2012 |
*| * * * | *
_________)/\\_//(\/(/\)/\//\/\///|_)_______
Stefan Metzmacher [Sat, 3 Mar 2012 04:38:46 +0000 (05:38 +0100)]
s3:smbd/globals.h: remove unused pollfd pointer
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Sun Mar 4 23:18:10 CET 2012 on sn-devel-104
Jelmer Vernooij [Sun, 4 Mar 2012 17:00:54 +0000 (18:00 +0100)]
selftest.py: Use testtools TestCase class.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sun Mar 4 19:38:25 CET 2012 on sn-devel-104
Jelmer Vernooij [Sun, 4 Mar 2012 15:53:59 +0000 (16:53 +0100)]
selftest.py: Add dummy init file (required to run tests).
Jelmer Vernooij [Sun, 4 Mar 2012 15:50:28 +0000 (16:50 +0100)]
selftest.pl: Remove unused --verbose option.
Jelmer Vernooij [Sun, 4 Mar 2012 15:50:21 +0000 (16:50 +0100)]
selftest.py: Remove unused --verbose option.
Jelmer Vernooij [Sun, 4 Mar 2012 15:49:30 +0000 (16:49 +0100)]
selftest.py: Remove unused code, reconcile signal handlers.
Jelmer Vernooij [Sun, 4 Mar 2012 15:39:43 +0000 (16:39 +0100)]
selftest.py: Fix handling of boolean options.
Jelmer Vernooij [Sun, 4 Mar 2012 15:32:56 +0000 (16:32 +0100)]
selftest.py: Fix signal handling.
Jelmer Vernooij [Sun, 4 Mar 2012 15:30:26 +0000 (16:30 +0100)]
Run selftest.py tests.
Jelmer Vernooij [Sun, 4 Mar 2012 15:22:34 +0000 (16:22 +0100)]
selftest: Now runs again for tests that use environment 'none'.
Jelmer Vernooij [Sun, 4 Mar 2012 15:01:18 +0000 (16:01 +0100)]
selftest.target: Add NoneTarget.
Jelmer Vernooij [Sun, 4 Mar 2012 14:11:36 +0000 (15:11 +0100)]
selftest.py: Finish conversion to python - now loads without syntax errors.
Jelmer Vernooij [Sun, 4 Mar 2012 13:55:39 +0000 (14:55 +0100)]
selftest.testlist: Add RestrictedTestManager.from_path.
Jelmer Vernooij [Sun, 4 Mar 2012 04:00:55 +0000 (05:00 +0100)]
selftest: More work on conversion to Python.
Jelmer Vernooij [Sun, 4 Mar 2012 03:19:26 +0000 (04:19 +0100)]
selftest.testlist: Add docstrings.
Jelmer Vernooij [Sun, 4 Mar 2012 03:16:16 +0000 (04:16 +0100)]
selftest.testlist: Add manager for restricted test lists.
Jelmer Vernooij [Sun, 4 Mar 2012 03:01:28 +0000 (04:01 +0100)]
Add TestListFilter definition.
Jelmer Vernooij [Sun, 4 Mar 2012 02:24:10 +0000 (03:24 +0100)]
selftest.testlist: Add read_testlist.
Jelmer Vernooij [Sun, 4 Mar 2012 02:12:35 +0000 (03:12 +0100)]
selftest.testlist: Add read_test_regexes.
Jelmer Vernooij [Sun, 4 Mar 2012 02:02:53 +0000 (03:02 +0100)]
selftest: Add testlist management module.
Jelmer Vernooij [Sun, 4 Mar 2012 01:38:15 +0000 (02:38 +0100)]
selftest.target: Add Environment.get_vars.
Jelmer Vernooij [Sun, 4 Mar 2012 01:37:42 +0000 (02:37 +0100)]
selftest: Add tests for trying to reuse an environment that has gone down.
Jelmer Vernooij [Sun, 4 Mar 2012 01:36:28 +0000 (02:36 +0100)]
selftest: Add tests for NoneEnvironment.
Jelmer Vernooij [Sun, 4 Mar 2012 01:32:26 +0000 (02:32 +0100)]
selftest.target: Test that environments are reused.
Jelmer Vernooij [Sun, 4 Mar 2012 01:31:32 +0000 (02:31 +0100)]
selftest.target: Add tests for get_running_env.
Jelmer Vernooij [Sun, 4 Mar 2012 01:30:42 +0000 (02:30 +0100)]
selftest.target: Add tests for getlog_env.
Jelmer Vernooij [Sun, 4 Mar 2012 01:29:34 +0000 (02:29 +0100)]
selftest.target: Add tests for check.
Jelmer Vernooij [Sun, 4 Mar 2012 01:28:06 +0000 (02:28 +0100)]
selftest.target: Add tests for setup.
Jelmer Vernooij [Sun, 4 Mar 2012 01:18:27 +0000 (02:18 +0100)]
selftest: Add base classes for Target/Environment and their management.
Jelmer Vernooij [Sun, 4 Mar 2012 01:17:52 +0000 (02:17 +0100)]
selftest.socket_wrapper: interface is an integer.
Jelmer Vernooij [Sun, 4 Mar 2012 00:36:16 +0000 (01:36 +0100)]
selftest.socket_wrapper: Add basic unit tests.
Jelmer Vernooij [Sun, 4 Mar 2012 00:36:01 +0000 (01:36 +0100)]
selftest.socket_wrapper: Add docstrings.
Jelmer Vernooij [Sun, 4 Mar 2012 00:31:44 +0000 (01:31 +0100)]
Add test infrastructure for selftest.
Jelmer Vernooij [Sun, 4 Mar 2012 00:30:58 +0000 (01:30 +0100)]
selftest: Add python version of socket wrapper utilities.
Jelmer Vernooij [Sun, 4 Mar 2012 00:24:10 +0000 (01:24 +0100)]
selftest: Add selftest.py.
Jelmer Vernooij [Sun, 4 Mar 2012 00:05:23 +0000 (01:05 +0100)]
kcc: Improve formatting of Python code to be more consistent with our other code.
Michael Adam [Fri, 2 Mar 2012 22:51:26 +0000 (23:51 +0100)]
libcli:smb: define SMB2_HDR_FLAG_REPLAY_OPERATION
Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Sun Mar 4 15:10:38 CET 2012 on sn-devel-104
Volker Lendecke [Sat, 3 Mar 2012 20:40:27 +0000 (21:40 +0100)]
s3: Fix some && vs & warnings
Signed-off-by: Andreas Schneider <asn@samba.org>
Autobuild-User: Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date: Sun Mar 4 13:31:25 CET 2012 on sn-devel-104
Andrew Bartlett [Sun, 4 Mar 2012 07:34:34 +0000 (18:34 +1100)]
selftest: Rework Samba3.pm process termination
We now store the timelimit child PID in memory, and confirm that the child has exited
with both waitpid() and kill(0, $pid).
By calling Samba::cleanup_child() we get exit status information.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Sun Mar 4 11:51:12 CET 2012 on sn-devel-104
Andrew Bartlett [Sun, 4 Mar 2012 07:32:44 +0000 (18:32 +1100)]
selftest: Rework Samba4.pm process termination.
We now double-check the waitpid() result with kill(0, $pid)
We now also send a SIGTERM, then a SIGKILL.
Andrew Bartlett
Andrew Bartlett [Sun, 4 Mar 2012 07:10:35 +0000 (18:10 +1100)]
selftest: Fix waitpid termination test
Andrew Bartlett [Sun, 4 Mar 2012 06:30:45 +0000 (17:30 +1100)]
selftest: Use fork()/exec() rather than system()
This follows the Samba3.pm model for starting child processes is to
use fork()/exec(). This reduces the number of processes being created
by selftest.pl, and gives us more information about the child process
and the running state in the parent.
Andrew Bartlett
Andrew Bartlett [Fri, 2 Mar 2012 07:22:10 +0000 (18:22 +1100)]
s3-winbindd: Add stdin handler for winbind
This will help avoid runaway processes in the test env, particularly when
the whole selftest.pl is killed.
Andrew Bartlett
Andrew Bartlett [Fri, 2 Mar 2012 07:21:09 +0000 (18:21 +1100)]
s3-nmbd: Add stdin handler for nmbd
This will help avoid runaway processes in the test env, particularly
when the whole selftest.pl is killed.
Andrew Bartlett
Andrew Bartlett [Fri, 2 Mar 2012 08:32:56 +0000 (19:32 +1100)]
change low FDs are handled in Samba
We now only close fds 0, 1, 2 when we are a forked daemon, and take
care not to close a file descriptor that we might need for foreground
stdin monitoring.
This should fix stdout logging in the lsa and epmapper deamons (ie in
make test).
Andrew Bartlett
Matthieu Patou [Sun, 4 Mar 2012 05:20:59 +0000 (21:20 -0800)]
s3: don't replace the error message if already defined
Autobuild-User: Matthieu Patou <mat@samba.org>
Autobuild-Date: Sun Mar 4 10:13:24 CET 2012 on sn-devel-104
Matthieu Patou [Fri, 2 Mar 2012 00:29:15 +0000 (16:29 -0800)]
s3: print a nice warning when HAVE_ADS is not enabled but you still try to do net rpc keytab vampire
Jelmer Vernooij [Sun, 4 Mar 2012 04:08:26 +0000 (05:08 +0100)]
selftest: Remove unused vde functions.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sun Mar 4 07:54:51 CET 2012 on sn-devel-104
Jelmer Vernooij [Sun, 4 Mar 2012 00:20:03 +0000 (01:20 +0100)]
selftest/README: Expand inconsistent tabs
Jelmer Vernooij [Sun, 4 Mar 2012 00:19:17 +0000 (01:19 +0100)]
selftest: Remove outdated template.
Jelmer Vernooij [Sun, 4 Mar 2012 00:18:58 +0000 (01:18 +0100)]
selftest: Remove unused and broken target 'windows'.
Jelmer Vernooij [Sat, 3 Mar 2012 21:22:50 +0000 (22:22 +0100)]
samba.7: Remove references to long gone testprns and smbsh utilities.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sun Mar 4 01:56:19 CET 2012 on sn-devel-104
Volker Lendecke [Sat, 3 Mar 2012 16:02:01 +0000 (17:02 +0100)]
s3: Fix a bogus if (client_len < 0)
On some platforms socklen_t might be unsigned, so comparing for <0
always returns true. Also, tsocket_address_bsd_sockaddr returns
ssize_t.
Autobuild-User: Volker Lendecke <vl@samba.org>
Autobuild-Date: Sat Mar 3 23:38:31 CET 2012 on sn-devel-104
Michael Adam [Sat, 3 Mar 2012 16:01:38 +0000 (17:01 +0100)]
selftest: more precisely skip durable-open, not durable.open
Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Sat Mar 3 19:17:32 CET 2012 on sn-devel-104
Michael Adam [Mon, 27 Feb 2012 21:56:37 +0000 (22:56 +0100)]
s4:torture:smb2: start a testsuite for durable v2 handles: durable and persistent opens
Michael Adam [Thu, 1 Mar 2012 01:22:36 +0000 (02:22 +0100)]
s4:libcli:smb2: set SMB2_CAP_ALL in the negprot
Stefan Metzmacher [Thu, 1 Mar 2012 00:38:09 +0000 (01:38 +0100)]
s3:libsmb: pass smb2 capabilities and client guid in cli_state_create()
metze
Signed-off-by: Michael Adam <obnox@samba.org>
Michael Adam [Wed, 29 Feb 2012 23:29:51 +0000 (00:29 +0100)]
s4:libcli:smb2: store the share capabilites in the smb2_tree object
Michael Adam [Wed, 29 Feb 2012 01:02:29 +0000 (02:02 +0100)]
smbXcli: add the possiblilty to negotiate client capabilites in smb >= 2.2
Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
Michael Adam [Mon, 27 Feb 2012 19:27:46 +0000 (20:27 +0100)]
s4:libcli:smb2: allow max protocol 0x0224
Michael Adam [Mon, 27 Feb 2012 19:15:18 +0000 (20:15 +0100)]
s4:libcli:smb2: add support for parsing the durable handle v2 response in smb2_create_recv()
Michael Adam [Mon, 27 Feb 2012 19:15:01 +0000 (20:15 +0100)]
s4:libcli:smb2: add support durable handle reconnect v2 blob in smb2_create_send
Michael Adam [Mon, 27 Feb 2012 19:15:01 +0000 (20:15 +0100)]
s4:libcli:smb2: add support durable handle request v2 blob in smb2_create_send
Michael Adam [Mon, 27 Feb 2012 01:35:24 +0000 (02:35 +0100)]
s4:libcli:smb2: add durable handle v2 data to the smb2_create i/o structure
Michael Adam [Fri, 2 Mar 2012 21:01:01 +0000 (22:01 +0100)]
libcli:smb: define SMB2_DHANDLE_FLAG_PERSISTENT
Michael Adam [Fri, 2 Mar 2012 18:01:50 +0000 (19:01 +0100)]
libcli:smb: add new SMB2 share flags
* FORCE_LEVELII_OPLOCKS
* ENABLE_HASH_V1
* ENABLE_HASH_V2
* ENCRYPT_DATA
Michael Adam [Wed, 29 Feb 2012 23:59:54 +0000 (00:59 +0100)]
libcli:smb: upgrade SMB2_CAP_ALL to include the newly known caps
Michael Adam [Tue, 28 Feb 2012 14:48:46 +0000 (15:48 +0100)]
libcli:smb: add defines for SMB2.2 share capabilities
* continuous avaliability
* cluster
* scaleout
Michael Adam [Tue, 28 Feb 2012 14:47:05 +0000 (15:47 +0100)]
libcli:smb: add defines for SMB2.2 global capabilities
* multi channel
* persistent handles
* directory leasing
* encryption
Michael Adam [Mon, 27 Feb 2012 01:17:20 +0000 (02:17 +0100)]
libcli:smb: define DH2Q and DH2C tags for smb2 extra create blobs
These are the tags for the SMB2_CREATE_DURABLE_HANDLE_REQUEST_V2
and SMB2_CREATE_DURABLE_HANDLE_RECONNECT_V2, the second version
of the SMB2_CREATE_DURABLE_HANDLE_REQUEST (DHnQ) and
SMB2_CREATE_DURABLE_HANDLE_RECONNECT (DHnC), which are only
available for SMB 2.2 (and newer).
Michael Adam [Wed, 29 Feb 2012 22:19:59 +0000 (23:19 +0100)]
s4:torture:smb2: rename some of the durable-handle subtests more systematically
Michael Adam [Wed, 29 Feb 2012 21:59:35 +0000 (22:59 +0100)]
s4:torture:smb2:durable_open: update (C)
Stefan Metzmacher [Thu, 23 Feb 2012 08:16:55 +0000 (09:16 +0100)]
s4:torture:smb2:durable-open: skip the open-with-lease test on servers without lease support
Signed-off-by: Michael Adam <obnox@samba.org>
Michael Adam [Tue, 28 Feb 2012 02:07:51 +0000 (03:07 +0100)]
s4:torture:smb2: durable-open: make tables static
Stefan Metzmacher [Thu, 23 Feb 2012 08:16:55 +0000 (09:16 +0100)]
s4:test:smb2:durable_open: skip lease tests when the server does not support leases
Signed-off-by: Michael Adam <obnox@samba.org>
Stefan Metzmacher [Thu, 23 Feb 2012 08:16:37 +0000 (09:16 +0100)]
s4:torture:smb2:durable_open: remove unused lease variables in the open-oplock test
Signed-off-by: Michael Adam <obnox@samba.org>
Michael Adam [Sat, 3 Mar 2012 06:14:35 +0000 (07:14 +0100)]
s3:smbd:smb2_write: improve logging in the error case
Matthias Dieter Wallnöfer [Fri, 2 Mar 2012 19:00:04 +0000 (20:00 +0100)]
s4:samba-tool domain level raise command - reference SAMDB object correctly
https://bugzilla.samba.org/show_bug.cgi?id=8787
Reviewed-by: Jelmer
Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Sat Mar 3 12:54:21 CET 2012 on sn-devel-104
Christian Ambach [Sat, 3 Mar 2012 05:35:22 +0000 (21:35 -0800)]
smb2_constants: fix a typo
Autobuild-User: Christian Ambach <ambi@samba.org>
Autobuild-Date: Sat Mar 3 09:04:40 CET 2012 on sn-devel-104
Christian Ambach [Sat, 3 Mar 2012 05:34:32 +0000 (21:34 -0800)]
s3:smb2_server: use SMB2_WATCH_TREE
it makes the code easier to understand if it uses the names specified in MS-SMB2 instead
of just the underlying values