mdw/samba.git
10 years agoAdd new "timeout" command and -t option to smbclient to set the per-operation timeout.
Jeremy Allison [Fri, 16 Aug 2013 20:49:39 +0000 (13:49 -0700)]
Add new "timeout" command and -t option to smbclient to set the per-operation timeout.

This is needed as once SMB3 encryption is selected the server
response time can be very slow when requesting large numbers
(256) of large encrypted packets (1MB) from a Windows 2012
virtual machine. This allows clients to tune their allowable
wait time.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
10 years agoAs SMB3 has transport level encryption, allow smbclient -e to force encryted SMB3...
Jeremy Allison [Fri, 16 Aug 2013 17:44:34 +0000 (10:44 -0700)]
As SMB3 has transport level encryption, allow smbclient -e to force encryted SMB3 transport.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
10 years agoRemove restrictions on setting iosize inside smbclient for SMB2 connections.
Jeremy Allison [Fri, 16 Aug 2013 18:45:43 +0000 (11:45 -0700)]
Remove restrictions on setting iosize inside smbclient for SMB2 connections.

Also remove the SMB1 restriction to minimum iosize of 16384 (0x4000):
Now values >= 0 and <= 0xFFFF00 can be set for SMB1, 0 meaning server
defined behaviour. 0 is the new default for iosize, both for SMB1 and SMB2.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
10 years agoFix bug #10100 - rpcclient crashes when sending the 'netshareenum 502' command
Jeremy Allison [Tue, 20 Aug 2013 17:55:27 +0000 (10:55 -0700)]
Fix bug #10100 - rpcclient crashes when sending the 'netshareenum 502' command

We are using the wrong variable for the returned count.
Reported by <pisymbol@gmail.com>.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Wed Aug 21 17:30:33 CEST 2013 on sn-devel-104

10 years agosmbd: Simplify new_break_message_smb1
Volker Lendecke [Mon, 19 Aug 2013 12:28:24 +0000 (12:28 +0000)]
smbd: Simplify new_break_message_smb1

There's no point in allocating a fixed length array that we throw away
immediately after use.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Tue Aug 20 14:35:21 CEST 2013 on sn-devel-104

10 years agosmbd: Replace a 0-timeout wakeup_send
Volker Lendecke [Fri, 16 Aug 2013 11:40:38 +0000 (11:40 +0000)]
smbd: Replace a 0-timeout wakeup_send

A tevent_immediate is simpler and is what we want here.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
10 years agodocs: Fix variable list in man vfs_crossrename.
Karolin Seeger [Tue, 13 Aug 2013 09:04:50 +0000 (11:04 +0200)]
docs: Fix variable list in man vfs_crossrename.

The varlist entries need a paragraph, otherwise the list is broken and the list
entries end with ".RE".

Fix bug #10076 - varlist in man vfs_crossrename broken.

Signed-off-by: Karolin Seeger <kseeger@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Aug 20 04:19:42 CEST 2013 on sn-devel-104

10 years agoMan pages for ntdb tools missing
Rusty Russell [Thu, 15 Aug 2013 03:02:06 +0000 (12:32 +0930)]
Man pages for ntdb tools missing

Copied and modified from tdb man pages.  Avoided reproducing API documentation
which is extensively documented in the ntdb.h header already.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=10000

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agolibsmb: Fix a bunch of Coverity IDs
Volker Lendecke [Mon, 19 Aug 2013 20:36:02 +0000 (22:36 +0200)]
libsmb: Fix a bunch of Coverity IDs

(fnum != -1) is always true, even if fnum=-1 was initialized. fnum is
a uint16, and the comparison first casts this to 65535, which is always
!= -1.

Also change the initialization to make it clearer what is happening here.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Aug 20 00:52:36 CEST 2013 on sn-devel-104

10 years agoFix bug #10097 - MacOSX 10.9 will not follow path-based DFS referrals handed out...
Richard Sharpe [Sun, 18 Aug 2013 14:34:31 +0000 (07:34 -0700)]
Fix bug #10097 - MacOSX 10.9 will not follow path-based DFS referrals handed out by Samba.

Windows overloads the EA Length field in the DIRECTORY INFO leves of FIND FIRST/FIND NEXT.

This field indicates either the REPARSE_TAG if the file/folder has a reparse proint or
the EA Length if it has EAs, and is the fundamental reason you cannot have both on a
file or folder.

Signed-off-by: Richard Sharpe <rsharpe@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Mon Aug 19 22:21:34 CEST 2013 on sn-devel-104

10 years agorpc_server: Fix CID 1063255 Resource leak
Volker Lendecke [Sun, 18 Aug 2013 20:41:51 +0000 (20:41 +0000)]
rpc_server: Fix CID 1063255 Resource leak

We would leak a socket 0 here

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Mon Aug 19 03:10:51 CEST 2013 on sn-devel-104

10 years agogensec: Fix CID 1063258 Uninitialized scalar variable
Volker Lendecke [Sun, 18 Aug 2013 20:37:26 +0000 (20:37 +0000)]
gensec: Fix CID 1063258 Uninitialized scalar variable

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agoregistry4: Fix CID 1034911 Dereference before null check
Volker Lendecke [Sun, 18 Aug 2013 19:34:35 +0000 (19:34 +0000)]
registry4: Fix CID 1034911 Dereference before null check

curbegin is always != NULL here (curend + 1) and is dereferenced by
strchr.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agosmbd: Fix CID 1063259 Uninitialized scalar variable
Volker Lendecke [Sun, 18 Aug 2013 20:35:32 +0000 (20:35 +0000)]
smbd: Fix CID 1063259 Uninitialized scalar variable

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agoldb_map: Fix CID 1034791 Dereference null return value
Volker Lendecke [Sun, 18 Aug 2013 19:54:31 +0000 (19:54 +0000)]
ldb_map: Fix CID 1034791 Dereference null return value

Add NULL checks

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agopyldb: Fix CID 1034792 Dereference null return value
Volker Lendecke [Sun, 18 Aug 2013 19:51:49 +0000 (19:51 +0000)]
pyldb: Fix CID 1034792 Dereference null return value

Add a NULL check

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agoldb: Fix CID 1034793 Dereference null return value
Volker Lendecke [Sun, 18 Aug 2013 19:49:24 +0000 (19:49 +0000)]
ldb: Fix CID 1034793 Dereference null return value

Add a proper NULL check

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agosamdb: Fix CID 1034910 Dereference before null check
Volker Lendecke [Sun, 18 Aug 2013 19:37:56 +0000 (19:37 +0000)]
samdb: Fix CID 1034910 Dereference before null check

strncmp("tdb://", sam_name, 6) dereferences sam_name. Check for
NULL before that.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agosamdb: Fix CID 1034910 Dereference before null check
Volker Lendecke [Sun, 18 Aug 2013 19:37:56 +0000 (19:37 +0000)]
samdb: Fix CID 1034910 Dereference before null check

strncmp("tdb://", sam_name, 6) dereferences sam_name. Check for
NULL before that.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agosamdb: Fix CID 1034910 Dereference before null check
Volker Lendecke [Sun, 18 Aug 2013 19:37:56 +0000 (19:37 +0000)]
samdb: Fix CID 1034910 Dereference before null check

strncmp("tdb://", secrets_ldb, 6) dereferences secrets_ldb. Check for
NULL before that.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agoregistry4: Fix CID 1034911 Dereference before null check
Volker Lendecke [Sun, 18 Aug 2013 19:34:35 +0000 (19:34 +0000)]
registry4: Fix CID 1034911 Dereference before null check

curbegin is always != NULL here (curend + 1) and is dereferenced by
strchr.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agolog2pcaphex: Fix nonempty line endings
Volker Lendecke [Sun, 18 Aug 2013 17:19:14 +0000 (17:19 +0000)]
log2pcaphex: Fix nonempty line endings

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agoldb: Fix a const warning
Volker Lendecke [Fri, 16 Aug 2013 12:56:04 +0000 (12:56 +0000)]
ldb: Fix a const warning

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Simo Sorce <idra@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Sun Aug 18 10:26:27 CEST 2013 on sn-devel-104

10 years agovfs_glusterfs: Implement proper mashalling/unmarshalling of ACLs
Anand Avati [Sun, 11 Aug 2013 19:59:29 +0000 (15:59 -0400)]
vfs_glusterfs: Implement proper mashalling/unmarshalling of ACLs

Use the primitives available in Samba byteorder.h for implementing
proper (un)marshalling of ACL xattrs.
- Incorporated Raghavendra Talur's comments on v3

Signed-off-by: Anand Avati <avati@redhat.com>
Signed-off-by: Raghavendra Talur <rtalur@redhat.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Christopher R. Hertel <crh@samba.org>
Tested-by: Jose A. Rivera <jarrpa@redhat.com>
Autobuild-User(master): Simo Sorce <idra@samba.org>
Autobuild-Date(master): Fri Aug 16 20:34:51 CEST 2013 on sn-devel-104

10 years agosmbd: Do not wait unnecessarily
Volker Lendecke [Fri, 16 Aug 2013 13:01:10 +0000 (13:01 +0000)]
smbd: Do not wait unnecessarily

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Fri Aug 16 18:46:36 CEST 2013 on sn-devel-104

10 years agosmbd: Make break_level2_to_none_async static
Volker Lendecke [Fri, 16 Aug 2013 12:47:10 +0000 (12:47 +0000)]
smbd: Make break_level2_to_none_async static

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
10 years agotevent: Remove a pointless goto
Volker Lendecke [Fri, 16 Aug 2013 11:32:08 +0000 (11:32 +0000)]
tevent: Remove a pointless goto

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
10 years agoloadparm: Use the new fully featured kcc by default
Matthieu Patou [Fri, 17 May 2013 09:31:31 +0000 (02:31 -0700)]
loadparm: Use the new fully featured kcc by default

Signed-off-by: Matthieu Patou <mat@matws.net>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Fri Aug 16 04:44:01 CEST 2013 on sn-devel-104

10 years agolibctdb: Avoid an explicit memset
Volker Lendecke [Tue, 13 Aug 2013 10:50:15 +0000 (10:50 +0000)]
libctdb: Avoid an explicit memset

Give the compiler a chance to use better code. Saves a few bytes of text.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Aug 16 01:51:55 CEST 2013 on sn-devel-104

10 years agotorture: support Windows 2k8 response for compress_invalid_buf
David Disseldorp [Tue, 13 Aug 2013 16:07:28 +0000 (18:07 +0200)]
torture: support Windows 2k8 response for compress_invalid_buf

Windows Server 2012 returns NT_STATUS_INVALID_USER_BUFFER, Windows
Server 2008r2 returns NT_STATUS_INVALID_PARAMETER. Don't fail the test
if either status is returned.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agotorture: add more [no-]compress-on-open ioctl tests
David Disseldorp [Tue, 13 Aug 2013 16:07:27 +0000 (18:07 +0200)]
torture: add more [no-]compress-on-open ioctl tests

compress_create_with_attr: Specifies the FILE_ATTRIBUTE_COMPRESSED
attribute at create time, then checks the created file.

compress_inherit_disable: Creates under a compressed directory, a file
with the NTCREATEX_OPTIONS_NO_COMPRESSION option. Then checks that the
newly created file doesn't inherit the parent compression state.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agotorture: add file_attribs arg to file create helper
David Disseldorp [Tue, 13 Aug 2013 16:07:26 +0000 (18:07 +0200)]
torture: add file_attribs arg to file create helper

Allows for the testing of file creation with FILE_ATTRIBUTE_COMPRESSED.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agotorture: add compressed file attribute ioctl test
David Disseldorp [Tue, 13 Aug 2013 16:07:25 +0000 (18:07 +0200)]
torture: add compressed file attribute ioctl test

After marking a file for compression via FSCTL_SET_COMPRESSION, the
FILE_ATTRIBUTE_COMPRESSED flag should be present. Test for this.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agotorture: check for filesystem compression capability
David Disseldorp [Tue, 13 Aug 2013 16:07:24 +0000 (18:07 +0200)]
torture: check for filesystem compression capability

Only run the compression tests if the compression capability is returned
by the server in response to an SMB2_QUERY_INFO(FS attribute info)
request.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agotorture: extend FSCTL_[GET/SET]_COMPRESSION tests
David Disseldorp [Tue, 13 Aug 2013 16:07:23 +0000 (18:07 +0200)]
torture: extend FSCTL_[GET/SET]_COMPRESSION tests

Check for inheritance of compression attributes from parent directories.
Also, test error handling for invalid requests.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agos3:libsmb: call smb2cli_logoff() from cli_ulogoff()
Stefan Metzmacher [Wed, 14 Aug 2013 22:18:47 +0000 (15:18 -0700)]
s3:libsmb: call smb2cli_logoff() from cli_ulogoff()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Thu Aug 15 10:53:21 CEST 2013 on sn-devel-104

10 years agos3:libsmb: make cli_ulogoff_send/recv static
Stefan Metzmacher [Wed, 14 Aug 2013 09:48:40 +0000 (11:48 +0200)]
s3:libsmb: make cli_ulogoff_send/recv static

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agos3:libsmb: call smb2cli_tdis() from cli_tdis()
Stefan Metzmacher [Wed, 14 Aug 2013 09:44:58 +0000 (11:44 +0200)]
s3:libsmb: call smb2cli_tdis() from cli_tdis()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agos3:libsmb: only set tcon to invalid in smb2cli_tdis*
Stefan Metzmacher [Wed, 14 Aug 2013 09:44:10 +0000 (11:44 +0200)]
s3:libsmb: only set tcon to invalid in smb2cli_tdis*

This matches the behavior of cli_tdis*.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agos3:libsmb: make cli_tdis_send/recv static
Stefan Metzmacher [Wed, 14 Aug 2013 09:38:22 +0000 (11:38 +0200)]
s3:libsmb: make cli_tdis_send/recv static

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agos3:libsmb: add support for SMB2 in cli_writeall()
Stefan Metzmacher [Tue, 13 Aug 2013 16:38:57 +0000 (18:38 +0200)]
s3:libsmb: add support for SMB2 in cli_writeall()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agos3:libsmb: add SMB2 support to cli_pull*
Stefan Metzmacher [Tue, 13 Aug 2013 16:20:08 +0000 (18:20 +0200)]
s3:libsmb: add SMB2 support to cli_pull*

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agos3:libsmb: add SMB2 support to cli_push*
Stefan Metzmacher [Tue, 13 Aug 2013 14:33:30 +0000 (16:33 +0200)]
s3:libsmb: add SMB2 support to cli_push*

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agos3:libsmb: Plumb cli_smb2_set_security_descriptor() inside cli_set_security_descriptor().
Jeremy Allison [Thu, 8 Aug 2013 18:00:49 +0000 (11:00 -0700)]
s3:libsmb: Plumb cli_smb2_set_security_descriptor() inside cli_set_security_descriptor().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agos3:libsmb: Plumb cli_smb2_query_security_descriptor() inside cli_query_security_descr...
Jeremy Allison [Thu, 8 Aug 2013 18:00:08 +0000 (11:00 -0700)]
s3:libsmb: Plumb cli_smb2_query_security_descriptor() inside cli_query_security_descriptor().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agos3:libsmb: Plumb cli_smb2_qpathinfo_alt_name() inside cli_qpathinfo_alt_name().
Jeremy Allison [Wed, 7 Aug 2013 23:50:03 +0000 (16:50 -0700)]
s3:libsmb: Plumb cli_smb2_qpathinfo_alt_name() inside cli_qpathinfo_alt_name().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agos3:libsmb: Plumb cli_smb2_qpathinfo_basic() inside cli_qpathinfo_basic().
Jeremy Allison [Thu, 8 Aug 2013 17:52:02 +0000 (10:52 -0700)]
s3:libsmb: Plumb cli_smb2_qpathinfo_basic() inside cli_qpathinfo_basic().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agos3:libsmb: Plumb cli_smb2_qfileinfo_basic() inside cli_qfileinfo_basic().
Jeremy Allison [Wed, 7 Aug 2013 23:47:21 +0000 (16:47 -0700)]
s3:libsmb: Plumb cli_smb2_qfileinfo_basic() inside cli_qfileinfo_basic().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agos3:libsmb: Plumb cli_smb2_qpathinfo_streams() inside cli_qpathinfo_streams().
Jeremy Allison [Wed, 7 Aug 2013 23:46:05 +0000 (16:46 -0700)]
s3:libsmb: Plumb cli_smb2_qpathinfo_streams() inside cli_qpathinfo_streams().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agos3:libsmb: Plumb cli_smb2_qpathinfo2() inside cli_qpathinfo2().
Jeremy Allison [Wed, 7 Aug 2013 23:45:05 +0000 (16:45 -0700)]
s3:libsmb: Plumb cli_smb2_qpathinfo2() inside cli_qpathinfo2().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agos3:libsmb: Plumb cli_smb2_list() inside cli_list().
Jeremy Allison [Wed, 7 Aug 2013 23:43:33 +0000 (16:43 -0700)]
s3:libsmb: Plumb cli_smb2_list() inside cli_list().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agos3:libsmb: Plumb cli_smb2_get_ea_list_path() inside cli_get_ea_list_path().
Jeremy Allison [Wed, 7 Aug 2013 23:42:02 +0000 (16:42 -0700)]
s3:libsmb: Plumb cli_smb2_get_ea_list_path() inside cli_get_ea_list_path().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agos3:libsmb: Plumb cli_smb2_set_ea_fnum() inside cli_set_ea_fnum().
Jeremy Allison [Wed, 7 Aug 2013 23:32:55 +0000 (16:32 -0700)]
s3:libsmb: Plumb cli_smb2_set_ea_fnum() inside cli_set_ea_fnum().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agos3:libsmb: Plumb cli_smb2_set_ea_path() inside cli_set_ea_path().
Jeremy Allison [Wed, 7 Aug 2013 23:21:48 +0000 (16:21 -0700)]
s3:libsmb: Plumb cli_smb2_set_ea_path() inside cli_set_ea_path().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agos3:libsmb: Fix cli_set_ea_path() to use frame instead of talloc_tos().
Jeremy Allison [Wed, 7 Aug 2013 23:19:06 +0000 (16:19 -0700)]
s3:libsmb: Fix cli_set_ea_path() to use frame instead of talloc_tos().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agos3:libsmb: Plumb cli_smb2_dskattr() inside cli_dskattr().
Jeremy Allison [Wed, 7 Aug 2013 23:17:12 +0000 (16:17 -0700)]
s3:libsmb: Plumb cli_smb2_dskattr() inside cli_dskattr().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agos3:libsmb: Plumb cli_smb2_getatr() inside cli_getatr().
Jeremy Allison [Wed, 14 Aug 2013 21:37:11 +0000 (14:37 -0700)]
s3:libsmb: Plumb cli_smb2_getatr() inside cli_getatr().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agos3:libsmb: Plumb cli_smb2_setatr() inside cli_setatr().
Jeremy Allison [Wed, 7 Aug 2013 23:16:03 +0000 (16:16 -0700)]
s3:libsmb: Plumb cli_smb2_setatr() inside cli_setatr().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agos3:libsmb: Plumb cli_smb2_setattrE() inside cli_setattrE().
Jeremy Allison [Wed, 7 Aug 2013 23:14:47 +0000 (16:14 -0700)]
s3:libsmb: Plumb cli_smb2_setattrE() inside cli_setattrE().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agos3:libsmb: Plumb cli_smb2_getattrE() inside cli_getattrE().
Jeremy Allison [Wed, 7 Aug 2013 23:11:59 +0000 (16:11 -0700)]
s3:libsmb: Plumb cli_smb2_getattrE() inside cli_getattrE().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agos3:libsmb: Plumb cli_smb2_close_fnum() inside cli_close().
Jeremy Allison [Wed, 7 Aug 2013 23:10:34 +0000 (16:10 -0700)]
s3:libsmb: Plumb cli_smb2_close_fnum() inside cli_close().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agos3:libsmb: Plumb cli_smb2_create_fnum() inside cli_ntcreate().
Jeremy Allison [Wed, 7 Aug 2013 23:06:19 +0000 (16:06 -0700)]
s3:libsmb: Plumb cli_smb2_create_fnum() inside cli_ntcreate().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agos3:libsmb: Plumb cli_smb2_rmdir() inside cli_rmdir().
Jeremy Allison [Wed, 7 Aug 2013 23:03:00 +0000 (16:03 -0700)]
s3:libsmb: Plumb cli_smb2_rmdir() inside cli_rmdir().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agos3:libsmb: Plumb cli_smb2_mkdir() inside cli_mkdir().
Jeremy Allison [Wed, 7 Aug 2013 23:01:49 +0000 (16:01 -0700)]
s3:libsmb: Plumb cli_smb2_mkdir() inside cli_mkdir().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agos3:libsmb: Plumb cli_smb2_unlink() inside cli_unlink().
Jeremy Allison [Wed, 7 Aug 2013 23:00:40 +0000 (16:00 -0700)]
s3:libsmb: Plumb cli_smb2_unlink() inside cli_unlink().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agos3:libsmb: Plumb cli_smb2_rename() inside cli_rename().
Jeremy Allison [Wed, 7 Aug 2013 22:59:13 +0000 (15:59 -0700)]
s3:libsmb: Plumb cli_smb2_rename() inside cli_rename().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agos3:libsmb: Add in the core of the libsmb client SMB2 functions.
Jeremy Allison [Wed, 7 Aug 2013 22:54:05 +0000 (15:54 -0700)]
s3:libsmb: Add in the core of the libsmb client SMB2 functions.

These create a synchronous cli_smb2_XXX() style interface
designed to plug directly into the libsmb/cliXXXX.c code.

https://bugzilla.samba.org/show_bug.cgi?id=9974

Signed-off-by: Jeremy Allison <jra@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
10 years agos3:lib: Factor read_ea_list_entry() and read_nttrans_ea_list() out so they can be...
Jeremy Allison [Wed, 7 Aug 2013 20:48:55 +0000 (13:48 -0700)]
s3:lib: Factor read_ea_list_entry() and read_nttrans_ea_list() out so they can be used by the SMB2 client code.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agos3:client: fix compiler warning
Stefan Metzmacher [Wed, 14 Aug 2013 08:47:11 +0000 (10:47 +0200)]
s3:client: fix compiler warning

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agos3:client: use the default io size
Stefan Metzmacher [Wed, 14 Aug 2013 08:46:28 +0000 (10:46 +0200)]
s3:client: use the default io size

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agos3:libsmb: remove unused cli_readall*
Stefan Metzmacher [Tue, 13 Aug 2013 16:23:55 +0000 (18:23 +0200)]
s3:libsmb: remove unused cli_readall*

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agos3:libsmb: rewrite cli_pull* to use smb1cli_conn_req_possible()
Stefan Metzmacher [Tue, 13 Aug 2013 16:03:50 +0000 (18:03 +0200)]
s3:libsmb: rewrite cli_pull* to use smb1cli_conn_req_possible()

This works out if it's possible to ship the next request dynamically
instead of relying on fixed values.

The default window size is 16 MByte.

We limit the number of outstanding chunks/requests to 256.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agos3:libsmb: rewrite cli_push* to use smb1cli_conn_req_possible()
Stefan Metzmacher [Tue, 13 Aug 2013 12:10:59 +0000 (14:10 +0200)]
s3:libsmb: rewrite cli_push* to use smb1cli_conn_req_possible()

This works out if it's possible to ship the next request dynamically
instead of relying on fixed values.

The default window size is 16 MByte.

We limit the number of outstanding chunks/requests to 256.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agolibcli/smb: add smb2cli_conn_req_possible()
Stefan Metzmacher [Tue, 13 Aug 2013 13:49:19 +0000 (15:49 +0200)]
libcli/smb: add smb2cli_conn_req_possible()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agolibcli/smb: add smb1cli_conn_req_possible()
Stefan Metzmacher [Tue, 13 Aug 2013 12:05:05 +0000 (14:05 +0200)]
libcli/smb: add smb1cli_conn_req_possible()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agolibcli/smb: pass max_dyn_len to smb2cli_req_send()
Stefan Metzmacher [Tue, 13 Aug 2013 08:25:52 +0000 (10:25 +0200)]
libcli/smb: pass max_dyn_len to smb2cli_req_send()

This way we can calculate the correct credit charge
for requests with large output buffers.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agolibcli/smb: pass max_dyn_len to smb2cli_req_create()
Stefan Metzmacher [Tue, 13 Aug 2013 07:54:42 +0000 (09:54 +0200)]
libcli/smb: pass max_dyn_len to smb2cli_req_create()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agolibcli/smb: calculate the credit charge on the input and output dyn_len
Stefan Metzmacher [Tue, 13 Aug 2013 07:50:29 +0000 (09:50 +0200)]
libcli/smb: calculate the credit charge on the input and output dyn_len

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agolibcli/smb: Change smb2cli_create() and smb2cli_create_recv() to return a parameter...
Jeremy Allison [Wed, 7 Aug 2013 22:01:50 +0000 (15:01 -0700)]
libcli/smb: Change smb2cli_create() and smb2cli_create_recv() to return a parameter blob of the newly opened/created file.

Will use in the smb2 client code.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agolibcli/smb: Fix smb2cli_write_recv() and smb2cli_write() to return the bytes written.
Jeremy Allison [Wed, 7 Aug 2013 21:41:24 +0000 (14:41 -0700)]
libcli/smb: Fix smb2cli_write_recv() and smb2cli_write() to return the bytes written.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agolibcli/smb: fix the credit handling on a SMB1 => SMB2 negotiate
Stefan Metzmacher [Wed, 14 Aug 2013 06:12:08 +0000 (08:12 +0200)]
libcli/smb: fix the credit handling on a SMB1 => SMB2 negotiate

Our cur_credit value had 1 credit too many in the case of
an SMB1 => SMB2 upgrade. When we max out the credits the server
disconnected the connection.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agos3:smbcacls: Add -m<MAX PROTOCOL> option to smbcacls.
Jeremy Allison [Thu, 8 Aug 2013 18:43:16 +0000 (11:43 -0700)]
s3:smbcacls: Add -m<MAX PROTOCOL> option to smbcacls.

https://bugzilla.samba.org/show_bug.cgi?id=9514

Signed-off-by: Jeremy Allison <jra@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agos3:libsmb: make use of lp_cli_{min,max}protocol() in SMBC_server_internal()
Stefan Metzmacher [Sun, 11 Aug 2013 12:01:36 +0000 (14:01 +0200)]
s3:libsmb: make use of lp_cli_{min,max}protocol() in SMBC_server_internal()

https://bugzilla.samba.org/show_bug.cgi?id=9514

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agos3:libsmb: use lp_cli_minprotocol() in do_connect()
Stefan Metzmacher [Sun, 11 Aug 2013 12:00:45 +0000 (14:00 +0200)]
s3:libsmb: use lp_cli_minprotocol() in do_connect()

https://bugzilla.samba.org/show_bug.cgi?id=9514

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agos3:winbindd: make use of lp_cli_{min,max}protocol()
Stefan Metzmacher [Sun, 11 Aug 2013 11:48:31 +0000 (13:48 +0200)]
s3:winbindd: make use of lp_cli_{min,max}protocol()

This changes winbindd back to use NT1 as defeault.

https://bugzilla.samba.org/show_bug.cgi?id=9514

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agos3:lib/netapi: make use of lp_cli_maxprotocol()
Stefan Metzmacher [Sun, 11 Aug 2013 11:46:34 +0000 (13:46 +0200)]
s3:lib/netapi: make use of lp_cli_maxprotocol()

https://bugzilla.samba.org/show_bug.cgi?id=9514

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agos3:libsmb: Ensure we ask for DEFAULT_SMB2_MAX_CREDITS on successful negprot.
Jeremy Allison [Fri, 9 Aug 2013 18:15:48 +0000 (11:15 -0700)]
s3:libsmb: Ensure we ask for DEFAULT_SMB2_MAX_CREDITS on successful negprot.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agos3:libsmb: Modify cli_start_connection_connected() to use lp_cli_minprotocol()/lp_cli...
Jeremy Allison [Thu, 8 Aug 2013 18:35:44 +0000 (11:35 -0700)]
s3:libsmb: Modify cli_start_connection_connected() to use lp_cli_minprotocol()/lp_cli_maxprotocol() instead of hard coding PROTOCOL_CORE, PROTOCOL_NT1.

https://bugzilla.samba.org/show_bug.cgi?id=9514

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agos3:lib: remove unused interpret_protocol()
Stefan Metzmacher [Sun, 11 Aug 2013 11:11:41 +0000 (13:11 +0200)]
s3:lib: remove unused interpret_protocol()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agos3:torture: avoid interpret_protocol()
Stefan Metzmacher [Sun, 11 Aug 2013 11:10:13 +0000 (13:10 +0200)]
s3:torture: avoid interpret_protocol()

lp_set_cmdline("client max protocol",...) and
lp_cli_maxprotocol() are the more generic solution.

https://bugzilla.samba.org/show_bug.cgi?id=9514

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agos3:client: avoid interpret_protocol()
Stefan Metzmacher [Sun, 11 Aug 2013 11:08:49 +0000 (13:08 +0200)]
s3:client: avoid interpret_protocol()

lp_set_cmdline("client max protocol",...) and
lp_cli_maxprotocol() are the more generic solution.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agos3:param: Correctly set up cli_maxprotocol, cli_minprotocol in our parameter block.
Jeremy Allison [Wed, 7 Aug 2013 22:17:01 +0000 (15:17 -0700)]
s3:param: Correctly set up cli_maxprotocol, cli_minprotocol in our parameter block.

Set to PROTOCOL_NT1, PROTOCOL_CORE by default.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=9829

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agoFollowup patch for BUG: https://bugzilla.samba.org/show_bug.cgi?id=10082
Andreas Schneider [Wed, 14 Aug 2013 23:50:13 +0000 (16:50 -0700)]
Followup patch for BUG: https://bugzilla.samba.org/show_bug.cgi?id=10082

Thanks to Jim Brown <jim.brown@rsmas.miami.edu>

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Volker Lendecke <Volker.Lendecke@SerNet.DE>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Aug 15 03:46:20 CEST 2013 on sn-devel-104

10 years agosmbd: Fix async echo handler forking (Bug 10086)
Volker Lendecke [Wed, 14 Aug 2013 10:46:46 +0000 (10:46 +0000)]
smbd: Fix async echo handler forking (Bug 10086)

If SMB3 is chosen via an SMB1 negprot, we forked the echo handler because
set_Protocol is called later, after the full protocol negotiation is done.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Wed Aug 14 15:54:43 CEST 2013 on sn-devel-104

10 years agowinbind3: Fix an invalid free
Volker Lendecke [Wed, 14 Aug 2013 09:27:59 +0000 (09:27 +0000)]
winbind3: Fix an invalid free

This fixes a warning I've never seen before :-)

../source3/winbindd/winbindd_cm.c:781:59: warning: attempt to free a non-heap object ‘machine_krb5_principal’ [-Wfree-nonheap-object]

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Wed Aug 14 14:04:16 CEST 2013 on sn-devel-104

10 years agos3-winbindd: fix fallback to ncacn_np in cm_connect_lsat().
Günther Deschner [Mon, 12 Aug 2013 15:23:12 +0000 (17:23 +0200)]
s3-winbindd: fix fallback to ncacn_np in cm_connect_lsat().

Fallback to lsa named-pipe connection when tcp connection has failed twice (it
could be a trusted domain connection where we cannot setup a secure channel).

Guenther

BUG: https://bugzilla.samba.org/show_bug.cgi?id=9615
BUG: https://bugzilla.samba.org/show_bug.cgi?id=9899

Signed-off-by: Günther Deschner <gd@samba.org>
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Tested-by: Christof Schmitt <christof.schmitt@us.ibm.com>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Tue Aug 13 20:55:33 CEST 2013 on sn-devel-104

10 years agos3-winbind: Fix a segfault passing NULL to a fstring argument.
Andreas Schneider [Mon, 12 Aug 2013 18:22:04 +0000 (20:22 +0200)]
s3-winbind: Fix a segfault passing NULL to a fstring argument.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=10082

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Tue Aug 13 13:58:26 CEST 2013 on sn-devel-104

10 years agodocs: Add man vfs_syncops.8 to waf build.
Karolin Seeger [Mon, 12 Aug 2013 07:02:07 +0000 (09:02 +0200)]
docs: Add man vfs_syncops.8 to waf build.

Signed-off-by: Karolin Seeger <kseeger@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Part of a fix for bug #7364 - man vfs_syncops missing.

Autobuild-User(master): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(master): Tue Aug 13 12:09:45 CEST 2013 on sn-devel-104

10 years agos3: smbd/connection: added routines to compute share connections
Shekhar Amlekar [Sun, 23 Jun 2013 14:14:34 +0000 (19:44 +0530)]
s3: smbd/connection: added routines to compute share connections

Added routines to compute share connections and used it
in srvsvc NetShareEnum call.

Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Aug 13 07:42:23 CEST 2013 on sn-devel-104

10 years agodocs: Add man page for vfs_linux_xfs_sgid.
Karolin Seeger [Mon, 12 Aug 2013 08:02:31 +0000 (10:02 +0200)]
docs: Add man page for vfs_linux_xfs_sgid.

Signed-off-by: Karolin Seeger <kseeger@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Aug 13 02:06:30 CEST 2013 on sn-devel-104