git.samba.org / martins / samba.git / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
martins/samba.git
10 years agoVERSION: Disable git snapshots for the 4.1.0rc3 release. samba-4.1.0rc3
commit | commitdiff | tree
Karolin Seeger [Fri, 6 Sep 2013 09:46:16 +0000 (11:46 +0200)]
VERSION: Disable git snapshots for the 4.1.0rc3 release.

Signed-off-by: Karolin Seeger <kseeger@samba.org>
10 years agoWHATSNEW: Update changes since 4.1.0rc2.
commit | commitdiff | tree
Karolin Seeger [Fri, 6 Sep 2013 09:11:39 +0000 (11:11 +0200)]
WHATSNEW: Update changes since 4.1.0rc2.

Signed-off-by: Karolin Seeger <kseeger@samba.org>
10 years agoOptimization. Don't do the retry logic if sitename_fetch() returned NULL, we already...
commit | commitdiff | tree
Jeremy Allison [Tue, 3 Sep 2013 21:07:43 +0000 (14:07 -0700)]
Optimization. Don't do the retry logic if sitename_fetch() returned NULL, we already did a NULL query.

Bug 5917 - Samba does not work on site with Read Only Domain Controller

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Sep  4 01:19:05 CEST 2013 on sn-devel-104

(cherry picked from commit bdab6f9431715fbfd28f8cc0dfb4dde2966f22f3)

10 years agoMove the retry logic when site_name is passed in a NULL or "" to the wrapper function.
commit | commitdiff | tree
Jeremy Allison [Tue, 3 Sep 2013 19:20:52 +0000 (12:20 -0700)]
Move the retry logic when site_name is passed in a NULL or "" to the wrapper function.

Bug 5917 - Samba does not work on site with Read Only Domain Controller

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Richard Sharpe <rsharpe@samba.org>
(cherry picked from commit 68e7b1c9446c7d1274b0fb85b59b90ac1a7f6041)

10 years agoMove the manipulation of site_name into the caller function dsgetdcname().
commit | commitdiff | tree
Jeremy Allison [Tue, 3 Sep 2013 19:08:46 +0000 (12:08 -0700)]
Move the manipulation of site_name into the caller function dsgetdcname().

Leave dsgetdcname_internal() only using const char *site_name.

Bug 5917 - Samba does not work on site with Read Only Domain Controller

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Richard Sharpe <rsharpe@samba.org>
(cherry picked from commit 181c11066bd53b07015a199f56eb71182e89ff71)

10 years agoRefactor dsgetdcname to be called via a wrapper function.
commit | commitdiff | tree
Jeremy Allison [Tue, 3 Sep 2013 19:04:37 +0000 (12:04 -0700)]
Refactor dsgetdcname to be called via a wrapper function.

Bug 5917 - Samba does not work on site with Read Only Domain Controller

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Richard Sharpe <rsharpe@samba.org>
(cherry picked from commit 66006be7ef703b2935334633d27641050cee5f58)

10 years agodsgetdcname_cache_fetch() doesn't use the site_name parameter so don't pass it.
commit | commitdiff | tree
Jeremy Allison [Tue, 3 Sep 2013 19:13:45 +0000 (12:13 -0700)]
dsgetdcname_cache_fetch() doesn't use the site_name parameter so don't pass it.

Bug 5917 - Samba does not work on site with Read Only Domain Controller

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Richard Sharpe <rsharpe@samba.org>
(cherry picked from commit dd12bfbcbf359c1642cc2e968aec62ae904aad5d)

10 years agosmbd: Correctly return INFO_LENGTH_MISMATCH for smb1
commit | commitdiff | tree
Volker Lendecke [Tue, 27 Aug 2013 09:40:19 +0000 (09:40 +0000)]
smbd: Correctly return INFO_LENGTH_MISMATCH for smb1

This is required if the client offered less buffer than the fixed portion
of the info level data requires

Bug: https://bugzilla.samba.org/show_bug.cgi?id=10106
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 1b1935b876a14154ef74e447bf53eb7cd0a5dde9)

10 years agosmbd: Fix error return for STREAM_INFO
commit | commitdiff | tree
Volker Lendecke [Tue, 27 Aug 2013 09:39:17 +0000 (09:39 +0000)]
smbd: Fix error return for STREAM_INFO

The stream_info marshalling follows its own rules. This needs unifying
eventually...

Bug: https://bugzilla.samba.org/show_bug.cgi?id=10106
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 5634f240fd4273cb7327111140ccbea0fd41e3fc)

10 years agosmbd: Revert a93f9c3
commit | commitdiff | tree
Volker Lendecke [Tue, 27 Aug 2013 09:38:29 +0000 (09:38 +0000)]
smbd: Revert a93f9c3

This was too broad and has been replaced by finer-grained error checks

Bug: https://bugzilla.samba.org/show_bug.cgi?id=10106
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit b37edda32930fec372d6467d442f67532c3fbd33)

10 years agosmbd: Correctly return BUFFER_OVERFLOW in smb2_getinfo
commit | commitdiff | tree
Volker Lendecke [Tue, 27 Aug 2013 09:37:34 +0000 (09:37 +0000)]
smbd: Correctly return BUFFER_OVERFLOW in smb2_getinfo

Also, don't overflow the client buffer

Bug: https://bugzilla.samba.org/show_bug.cgi?id=10106
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 40f60024ca19e33cbbe9825b42692f386a8f1dd9)

10 years agosmbd: Correctly return INFO_LENGTH_MISMATCH in smb2_getinfo
commit | commitdiff | tree
Volker Lendecke [Tue, 27 Aug 2013 09:36:03 +0000 (09:36 +0000)]
smbd: Correctly return INFO_LENGTH_MISMATCH in smb2_getinfo

We have to return this error if the client offered less than the fixed
portion of the infolevel data requires

Bug: https://bugzilla.samba.org/show_bug.cgi?id=10106
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 91939614760837b2ac2c6bb8b5daac108a4f4670)

10 years agosmbd: qfsinfo has fixed/variable buffers
commit | commitdiff | tree
Volker Lendecke [Tue, 27 Aug 2013 09:06:27 +0000 (09:06 +0000)]
smbd: qfsinfo has fixed/variable buffers

The error message will have to change depending whether the buffer is
too small for the fixed or variable buffers

Bug: https://bugzilla.samba.org/show_bug.cgi?id=10106
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit ac41df91a5a425633fc716ca02187e753879d795)

10 years agosmbd: qfilepathinfo has fixed/variable buffers
commit | commitdiff | tree
Volker Lendecke [Tue, 27 Aug 2013 09:06:27 +0000 (09:06 +0000)]
smbd: qfilepathinfo has fixed/variable buffers

The error message will have to change depending whether the buffer is
too small for the fixed or variable buffers

Bug: https://bugzilla.samba.org/show_bug.cgi?id=10106
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 53123996033594f68a3fc9037474aada3aef0750)

10 years agosmbd: Use #defines in smb2_getinfo_send
commit | commitdiff | tree
Volker Lendecke [Mon, 26 Aug 2013 08:36:14 +0000 (08:36 +0000)]
smbd: Use #defines in smb2_getinfo_send

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Autobuild-User(master): David Disseldorp <ddiss@samba.org>
Autobuild-Date(master): Tue Aug 27 15:08:08 CEST 2013 on sn-devel-104

(cherry picked from commit 323cccd35d06c7327c19dc5cb891043507624d7d)

10 years agos3:smbd: allow info class SMB_QUERY_FS_ATTRIBUTE_INFO to return partial data
commit | commitdiff | tree
Ralph Wuerthner [Wed, 10 Jul 2013 14:43:39 +0000 (16:43 +0200)]
s3:smbd: allow info class SMB_QUERY_FS_ATTRIBUTE_INFO to return partial data

Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <Volker.Lendecke@SerNet.DE>
(cherry picked from commit 270d29a743a030653037cb176f3764bec3c79b6c)

10 years agos3:smbd: allow info class SMB_QUERY_FS_VOLUME_INFO to return partial data
commit | commitdiff | tree
Ralph Wuerthner [Wed, 10 Jul 2013 13:52:06 +0000 (15:52 +0200)]
s3:smbd: allow info class SMB_QUERY_FS_VOLUME_INFO to return partial data

Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <Volker.Lendecke@SerNet.DE>
(cherry picked from commit ec46f6b91941e38dd92f8e0fb0f278592e3157b6)

10 years agos3:smbd: allow status code in smbd_do_qfsinfo() to be set by information class handler
commit | commitdiff | tree
Ralph Wuerthner [Fri, 5 Jul 2013 09:32:27 +0000 (11:32 +0200)]
s3:smbd: allow status code in smbd_do_qfsinfo() to be set by information class handler

Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <Volker.Lendecke@SerNet.DE>
(cherry picked from commit 616777f029e462f53c5118d79de8c6405a5fb7c1)

10 years agos3:smbd: allow GetInfo responses with STATUS_BUFFER_OVERFLOW to return partial, but...
commit | commitdiff | tree
Ralph Wuerthner [Fri, 5 Jul 2013 09:03:16 +0000 (11:03 +0200)]
s3:smbd: allow GetInfo responses with STATUS_BUFFER_OVERFLOW to return partial, but valid data

Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <Volker.Lendecke@SerNet.DE>
(cherry picked from commit a91d2b05bab329a8a9772c2c79a3b1e02933182e)

10 years agos3:smbd: return NT_STATUS_INFO_LENGTH_MISMATCH for GetInfo in case output_buffer_leng...
commit | commitdiff | tree
Ralph Wuerthner [Wed, 10 Jul 2013 06:59:58 +0000 (08:59 +0200)]
s3:smbd: return NT_STATUS_INFO_LENGTH_MISMATCH for GetInfo in case output_buffer_length is too small

Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <Volker.Lendecke@SerNet.DE>
(cherry picked from commit a93f9c3d33e442c84d0c9da7eb5d25ca4b54fc33)

10 years agotorture: Ensure that GSSAPI and SPNEGO packets are accepted by dlz_bind9
commit | commitdiff | tree
Andrew Bartlett [Fri, 28 Dec 2012 10:00:28 +0000 (21:00 +1100)]
torture: Ensure that GSSAPI and SPNEGO packets are accepted by dlz_bind9

This exercises some more of the dlz_bind9 code outside BIND, by
sending in a ticket to be access checked, wrapped either in SPNEGO or
just in GSSAPI.

Andrew Bartlett

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Wed Sep  4 11:25:10 CEST 2013 on sn-devel-104

(cherry picked from commit 38e43961c01f6f491b069e7106fe2a2ec80bd840)

The last 6 patches address bug #9091 - When replicating DNS for bind9_dlz we
need to create the server-DNS account remotely.

10 years agoselftest: Add a basic test of samba_upgradedns
commit | commitdiff | tree
Andrew Bartlett [Thu, 27 Dec 2012 23:06:39 +0000 (10:06 +1100)]
selftest: Add a basic test of samba_upgradedns

This does not check that the command runs correctly, but does at least check
that the command runs to completion without errors.

Andrew Bartlett

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit 16b26eafa75280e576333975cff5dd1505c118fa)

10 years agoselftest: Start internal DNS server on domain provisioned for BIND9_DLZ
commit | commitdiff | tree
Andrew Bartlett [Thu, 27 Dec 2012 22:25:11 +0000 (09:25 +1100)]
selftest: Start internal DNS server on domain provisioned for BIND9_DLZ

This shows that the internal server can use the dns-SERVER account.

Andrew Bartlett

Reviewed-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit 013c4990c6f1412dd25592bf177ceffab4b5d16d)

10 years agoselftest: Test creation of the dns-SERVER account during selftest
commit | commitdiff | tree
Andrew Bartlett [Tue, 25 Dec 2012 23:03:47 +0000 (10:03 +1100)]
selftest: Test creation of the dns-SERVER account during selftest

We do this by having the samba-tool domain dcpromo for promoted_vampire_dc also create a
dns-SERVER account.

Andrew Bartlett

Reviewed-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit e281037c9bfa68ca3dc564ec7a36e5c790024902)

10 years agoscripting/samba_upgradedns: Tighten up exception and attribute list handling
commit | commitdiff | tree
Andrew Bartlett [Sun, 23 Dec 2012 22:12:04 +0000 (09:12 +1100)]
scripting/samba_upgradedns: Tighten up exception and attribute list handling

This avoids asking for attributes that will not be used, and looks only for the
expected exceptions, rather than all exceptions.

Andrew Bartlett

Reviewed-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit d19c437a36b26e71c24bc25e672d714e21ba50bd)

10 years agoscripting/join.py: Handle creating the dns-NAME account during a DC join
commit | commitdiff | tree
Andrew Bartlett [Sun, 23 Dec 2012 21:56:50 +0000 (08:56 +1100)]
scripting/join.py: Handle creating the dns-NAME account during a DC join

This will ensure that the DLZ plugin works out of the box when joining a second Samba DC to the
domain.

Andrew Bartlett

Reviewed-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit b106d9090e8f8f44f02059d2ced3d10066787060)

10 years agoWHATSNEW: Add paragraph about SMB2/3 support for client tools/library.
commit | commitdiff | tree
Jeremy Allison [Fri, 6 Sep 2013 08:09:52 +0000 (10:09 +0200)]
WHATSNEW: Add paragraph about SMB2/3 support for client tools/library.

Signed-off-by: Jeremy Allison <jra@samba.org>
Signed-off-by: Karolin Seeger <kseeger@samba.org>
10 years agoWHATSNEW: Add release notes for Samba 4.1.0rc3.
commit | commitdiff | tree
Karolin Seeger [Wed, 4 Sep 2013 08:59:22 +0000 (10:59 +0200)]
WHATSNEW: Add release notes for Samba 4.1.0rc3.

Signed-off-by: Karolin Seeger <kseeger@samba.org>
Autobuild-User(v4-1-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-1-test): Wed Sep  4 12:52:02 CEST 2013 on sn-devel-104

10 years agopython/provision: remove unused linklocal=False argument from interface_ips_v6()
commit | commitdiff | tree
Stefan Metzmacher [Fri, 30 Aug 2013 13:18:44 +0000 (15:18 +0200)]
python/provision: remove unused linklocal=False argument from interface_ips_v6()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Bjoern Jacke <bj@sernet.de>
Autobuild-User(master): Björn Jacke <bj@sernet.de>
Autobuild-Date(master): Fri Aug 30 17:33:58 CEST 2013 on sn-devel-104

(cherry picked from commit 3430448fc01ce3fbe0606a2c239d3c98a5b78361)

The last 3 patches address bug #10030 - ::1 added to nameserver on join.

Autobuild-User(v4-1-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-1-test): Mon Sep  2 11:50:45 CEST 2013 on sn-devel-104

10 years agos4:samba_upgradedns: don't pass linklocal=False to interface_ips_v6()
commit | commitdiff | tree
Stefan Metzmacher [Fri, 30 Aug 2013 13:17:59 +0000 (15:17 +0200)]
s4:samba_upgradedns: don't pass linklocal=False to interface_ips_v6()

This is the default...

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Bjoern Jacke <bj@sernet.de>
(cherry picked from commit 9edc0276c742194ec381c266acedf3216ccf1c69)

10 years agopython/pyglue: filter out loopback and linklocal addresses unless all_interfaces...
commit | commitdiff | tree
Stefan Metzmacher [Fri, 30 Aug 2013 12:59:01 +0000 (14:59 +0200)]
python/pyglue: filter out loopback and linklocal addresses unless all_interfaces is given

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

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Bjoern Jacke <bj@sernet.de>
(cherry picked from commit 0e6aca40413fb3cfd4300f282204a69743be4a65)

10 years agoclient: add missing newlines to error messages for invalid iosize parameter.
commit | commitdiff | tree
Michael Adam [Wed, 21 Aug 2013 14:12:30 +0000 (16:12 +0200)]
client: add missing newlines to error messages for invalid iosize parameter.

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

(cherry picked from commit db1d0349c4d898141a39f515c690e21409448d56)

The last 70 patches address bug #9974 - smbclient does not support SMB2.

Autobuild-User(v4-1-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-1-test): Fri Aug 30 13:50:13 CEST 2013 on sn-devel-104

10 years agoAdd documentation for the new internal command timeout to smbclient.
commit | commitdiff | tree
Jeremy Allison [Fri, 16 Aug 2013 23:57:34 +0000 (16:57 -0700)]
Add documentation for the new internal command timeout to smbclient.

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 19:24:06 CEST 2013 on sn-devel-104

(cherry picked from commit 8d0392f9f7973e72a6082d66f81180d19eb0a56f)

10 years agoAdd documentation for the new -t <timeout> parameter in smbclient.
commit | commitdiff | tree
Jeremy Allison [Fri, 16 Aug 2013 23:56:22 +0000 (16:56 -0700)]
Add documentation for the new -t <timeout> parameter in smbclient.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
(cherry picked from commit f7dc59b3ad293105756433ef52c67e195eb49361)

10 years agoFix the documentation of --encrypt to explain SMB3 encryption for smbclient.
commit | commitdiff | tree
Jeremy Allison [Fri, 16 Aug 2013 23:53:45 +0000 (16:53 -0700)]
Fix the documentation of --encrypt to explain SMB3 encryption for smbclient.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
(cherry picked from commit 4044e2beb7145afb261c98e100574e4e842e1b9e)

10 years agoFix the documentation of the iosize command to explain the new zero default for smbcl...
commit | commitdiff | tree
Jeremy Allison [Fri, 16 Aug 2013 23:49:41 +0000 (16:49 -0700)]
Fix the documentation of the iosize command to explain the new zero default for smbclient.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
(cherry picked from commit 90566fd0deb8768acc96b0a0bc573183c4db20ef)

10 years agoFix the documentation for --send-buffersize for the new default value of zero for...
commit | commitdiff | tree
Jeremy Allison [Fri, 16 Aug 2013 23:48:18 +0000 (16:48 -0700)]
Fix the documentation for --send-buffersize for the new default value of zero for smbclient.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
(cherry picked from commit 659f5fecd69fb240c1a2ea385584c22d00476b59)

10 years agoExpand on the documentation of -m max-protocol for SMB2/3 for smbclient.
commit | commitdiff | tree
Jeremy Allison [Fri, 16 Aug 2013 23:47:13 +0000 (16:47 -0700)]
Expand on the documentation of -m max-protocol for SMB2/3 for smbclient.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
(cherry picked from commit 252a6b6d8a27f4b8be61c6b091318ddb76776471)

10 years agoAdd "-e" encrypt transport command line option documentation for smbcacls.
commit | commitdiff | tree
Jeremy Allison [Fri, 16 Aug 2013 23:45:26 +0000 (16:45 -0700)]
Add "-e" encrypt transport command line option documentation for smbcacls.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
(cherry picked from commit 5b60d95abc767131b97151f03d7f668c81e728cb)

10 years agoAdd "max protocol" command line documentation for smbcacls.
commit | commitdiff | tree
Jeremy Allison [Fri, 16 Aug 2013 23:44:14 +0000 (16:44 -0700)]
Add "max protocol" command line documentation for smbcacls.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
(cherry picked from commit 646ed6884c91cde7c9aec6fdb1a25d0e6a0898d0)

10 years agoAdd new "timeout" command and -t option to smbclient to set the per-operation timeout.
commit | commitdiff | tree
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>
(cherry picked from commit d9c88a56dc451be09e8c9fc9aa8857e312fcb444)

10 years agoAs SMB3 has transport level encryption, allow smbclient -e to force encryted SMB3...
commit | commitdiff | tree
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>
(cherry picked from commit 81e1058e20bcfc1efab2b39dd7642d8dbbe0cb3b)

10 years agoRemove restrictions on setting iosize inside smbclient for SMB2 connections.
commit | commitdiff | tree
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>
(cherry picked from commit 25521c90859de0651216c459273b2ffd916ee299)

10 years agolibsmb: Fix a bunch of Coverity IDs
commit | commitdiff | tree
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

(cherry picked from commit 4f96d5753ffe6c446c46676ba31cd2a3722890a0)

10 years agos3:libsmb: call smb2cli_logoff() from cli_ulogoff()
commit | commitdiff | tree
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

(cherry picked from commit b706ca6e55aa76d4da901c69d991969602facc3b)

10 years agos3:libsmb: make cli_ulogoff_send/recv static
commit | commitdiff | tree
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>
(cherry picked from commit 1d7bdfc4feac35d92b003c3c78f502897ecc5d4e)

10 years agos3:libsmb: call smb2cli_tdis() from cli_tdis()
commit | commitdiff | tree
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>
(cherry picked from commit e6be68fb5e4dc528f7365f3413b9b66090992f42)

10 years agos3:libsmb: only set tcon to invalid in smb2cli_tdis*
commit | commitdiff | tree
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>
(cherry picked from commit d732e9aab3bbad3ea97f8b120e57b41152aaee3b)

10 years agos3:libsmb: make cli_tdis_send/recv static
commit | commitdiff | tree
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>
(cherry picked from commit 80d4f64352c0ddacb9ee15d2b48a42a0b7929501)

10 years agos3:libsmb: add support for SMB2 in cli_writeall()
commit | commitdiff | tree
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>
(cherry picked from commit ccf7b3719121e03ed06d15b9af5373eecba3e828)

10 years agos3:libsmb: add SMB2 support to cli_pull*
commit | commitdiff | tree
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>
(cherry picked from commit a85d4511e6bc84938d60f090b44a5b1468ee4136)

10 years agos3:libsmb: add SMB2 support to cli_push*
commit | commitdiff | tree
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>
(cherry picked from commit 6896bf0b28a07eb8ead5b3bd2bc50229aa59d439)

10 years agos3:libsmb: Plumb cli_smb2_set_security_descriptor() inside cli_set_security_descriptor().
commit | commitdiff | tree
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>
(cherry picked from commit 80758e4b07c87280e778ba161c2c9c4a2ee47853)

10 years agos3:libsmb: Plumb cli_smb2_query_security_descriptor() inside cli_query_security_descr...
commit | commitdiff | tree
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>
(cherry picked from commit 1db7e90451f31d75298508c19a859d98d56d7e7c)

10 years agos3:libsmb: Plumb cli_smb2_qpathinfo_alt_name() inside cli_qpathinfo_alt_name().
commit | commitdiff | tree
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>
(cherry picked from commit de895bf228432f2a42bcdcadcf12ffd1be64022f)

10 years agos3:libsmb: Plumb cli_smb2_qpathinfo_basic() inside cli_qpathinfo_basic().
commit | commitdiff | tree
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>
(cherry picked from commit cba3ed0466b8598e28a44809778b99e97b1bf1a1)

10 years agos3:libsmb: Plumb cli_smb2_qfileinfo_basic() inside cli_qfileinfo_basic().
commit | commitdiff | tree
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>
(cherry picked from commit 2bb3e251d59910d9bf527a73271094702bceefe2)

10 years agos3:libsmb: Plumb cli_smb2_qpathinfo_streams() inside cli_qpathinfo_streams().
commit | commitdiff | tree
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>
(cherry picked from commit e96309ca1b057d430444531523bb2c9f59fcd624)

10 years agos3:libsmb: Plumb cli_smb2_qpathinfo2() inside cli_qpathinfo2().
commit | commitdiff | tree
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>
(cherry picked from commit f2f566b1cc8d55bd1cf93478b877a3e7f455855c)

10 years agos3:libsmb: Plumb cli_smb2_list() inside cli_list().
commit | commitdiff | tree
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>
(cherry picked from commit 73255d3ba912b3a112f9d766deae895f51e16cd9)

10 years agos3:libsmb: Plumb cli_smb2_get_ea_list_path() inside cli_get_ea_list_path().
commit | commitdiff | tree
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>
(cherry picked from commit 7e2d969deb1d4bcf3add422d80852b2d386cfaac)

10 years agos3:libsmb: Plumb cli_smb2_set_ea_fnum() inside cli_set_ea_fnum().
commit | commitdiff | tree
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>
(cherry picked from commit f8dfc50124e5b5083aa801d9658389dd3fa6698a)

10 years agos3:libsmb: Plumb cli_smb2_set_ea_path() inside cli_set_ea_path().
commit | commitdiff | tree
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>
(cherry picked from commit 3276853e59c2686873baad7c6f9d2665ed6fdd56)

10 years agos3:libsmb: Fix cli_set_ea_path() to use frame instead of talloc_tos().
commit | commitdiff | tree
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>
(cherry picked from commit c1aeada4dd1f165eb33354c5a4323ed1ebf453a9)

10 years agos3:libsmb: Plumb cli_smb2_dskattr() inside cli_dskattr().
commit | commitdiff | tree
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>
(cherry picked from commit c6ed0b88312d7e231749a09a87944caea4c9808e)

10 years agos3:libsmb: Plumb cli_smb2_getatr() inside cli_getatr().
commit | commitdiff | tree
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>
(cherry picked from commit 75d2e18502ccb811c018535f3c5c7325bdf5e613)

10 years agos3:libsmb: Plumb cli_smb2_setatr() inside cli_setatr().
commit | commitdiff | tree
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>
(cherry picked from commit ea267a7e4b4c413336b2bf54eb53ffc8d1524b44)

10 years agos3:libsmb: Plumb cli_smb2_setattrE() inside cli_setattrE().
commit | commitdiff | tree
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>
(cherry picked from commit 83c410c99e3ef8db00dd002c1a1a93b0035cd2e7)

10 years agos3:libsmb: Plumb cli_smb2_getattrE() inside cli_getattrE().
commit | commitdiff | tree
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>
(cherry picked from commit 0bbc0446210fa504f9834de948c4d066df752666)

10 years agos3:libsmb: Plumb cli_smb2_close_fnum() inside cli_close().
commit | commitdiff | tree
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>
(cherry picked from commit 85f60cc3d8f68ce5eb687cc6e367bb66bdef8b99)

10 years agos3:libsmb: Plumb cli_smb2_create_fnum() inside cli_ntcreate().
commit | commitdiff | tree
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>
(cherry picked from commit c1c4491d5e5bb16c274fe4fe162156a7ec910b93)

10 years agos3:libsmb: Plumb cli_smb2_rmdir() inside cli_rmdir().
commit | commitdiff | tree
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>
(cherry picked from commit 04d396566b90f32dc239450596ab50502f9cbb02)

10 years agos3:libsmb: Plumb cli_smb2_mkdir() inside cli_mkdir().
commit | commitdiff | tree
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>
(cherry picked from commit 46da267afd540fe2d31f1395cda9e2853cf6432a)

10 years agos3:libsmb: Plumb cli_smb2_unlink() inside cli_unlink().
commit | commitdiff | tree
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>
(cherry picked from commit 179c27dd0235c4949045eef2ffb7a87175a4483b)

10 years agos3:libsmb: Plumb cli_smb2_rename() inside cli_rename().
commit | commitdiff | tree
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>
(cherry picked from commit c748a959b40f184190cd537f0ad5f0772b484841)

10 years agos3:libsmb: Add in the core of the libsmb client SMB2 functions.
commit | commitdiff | tree
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>
(cherry picked from commit 28591dfd5d2163d9181d45d64a4a750e335b7c56)

10 years agos3:lib: Factor read_ea_list_entry() and read_nttrans_ea_list() out so they can be...
commit | commitdiff | tree
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>
(cherry picked from commit c80349e0fad7c182b0bddefed99a78d95323faca)

10 years agos3:client: fix compiler warning
commit | commitdiff | tree
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>
(cherry picked from commit 2394f8788d2f6e21064db0b6099a0dbe3a33e1d6)

10 years agos3:client: use the default io size
commit | commitdiff | tree
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>
(cherry picked from commit 9b4692f2d057f31f76db0bdf7c4a515db057e2dd)

10 years agos3:libsmb: remove unused cli_readall*
commit | commitdiff | tree
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>
(cherry picked from commit 9193a58375691bfca9e3cce1ff61b2b6dd65a982)

10 years agos3:libsmb: rewrite cli_pull* to use smb1cli_conn_req_possible()
commit | commitdiff | tree
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>
(cherry picked from commit 8062aefbe3c2fcc73e3d19af6663c8736c570f7c)

10 years agos3:libsmb: rewrite cli_push* to use smb1cli_conn_req_possible()
commit | commitdiff | tree
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>
(cherry picked from commit b846b3acd2b217a0d67c1e8fcb039e03498c4e47)

10 years agolibcli/smb: add smb2cli_conn_req_possible()
commit | commitdiff | tree
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>
(cherry picked from commit 7efdc323d1a1abdae70bcafefe07b3cffcdb2521)

10 years agolibcli/smb: add smb1cli_conn_req_possible()
commit | commitdiff | tree
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>
(cherry picked from commit 111f529a2a5832b822445bb4f63b142d8ccb2cb7)

10 years agolibcli/smb: pass max_dyn_len to smb2cli_req_send()
commit | commitdiff | tree
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>
(cherry picked from commit 44b53937d59842a63e2cbfa92219f4f519530b0a)

10 years agolibcli/smb: pass max_dyn_len to smb2cli_req_create()
commit | commitdiff | tree
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>
(cherry picked from commit 4a3352020db962ef40728d8a754da8a9418ca8a7)

10 years agolibcli/smb: calculate the credit charge on the input and output dyn_len
commit | commitdiff | tree
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>
(cherry picked from commit 318735fd5e15c5fd7010c0f657c86d27b45279ac)

10 years agolibcli/smb: Change smb2cli_create() and smb2cli_create_recv() to return a parameter...
commit | commitdiff | tree
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>
(cherry picked from commit 1229881df6bd22d4b5055ad283061332ba1c9bc8)

10 years agolibcli/smb: Fix smb2cli_write_recv() and smb2cli_write() to return the bytes written.
commit | commitdiff | tree
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>
(cherry picked from commit 00f784ec91d2cfa95b20327ac20f5bc3fa1f400e)

10 years agolibcli/smb: fix the credit handling on a SMB1 => SMB2 negotiate
commit | commitdiff | tree
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>
(cherry picked from commit 97288b7f1048c1bf712463293a1e62737738292c)

10 years agos3:smbcacls: Add -m<MAX PROTOCOL> option to smbcacls.
commit | commitdiff | tree
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>
(cherry picked from commit f6ce50a8aca9eb024af4eb5e3dd620fe5e04e913)

10 years agos3:libsmb: make use of lp_cli_{min,max}protocol() in SMBC_server_internal()
commit | commitdiff | tree
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>
(cherry picked from commit daeb0bdfc49ace6151bbca34cbbf55486d66abb6)

10 years agos3:libsmb: use lp_cli_minprotocol() in do_connect()
commit | commitdiff | tree
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>
(cherry picked from commit 42a493dff0e4ade04b6e94caf0b7ae14b6cf60eb)

10 years agos3:winbindd: make use of lp_cli_{min,max}protocol()
commit | commitdiff | tree
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>
(cherry picked from commit dd9155a7ec7f1989cb18e79907d0fa1c9ee845a4)

10 years agos3:lib/netapi: make use of lp_cli_maxprotocol()
commit | commitdiff | tree
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>
(cherry picked from commit 7e455e9ed2b298df6b735a89abdd75564375ef34)

10 years agos3:libsmb: Ensure we ask for DEFAULT_SMB2_MAX_CREDITS on successful negprot.
commit | commitdiff | tree
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>
(cherry picked from commit 14421323d1dd3744cb8553f0e6a5a7436554bf2d)

10 years agos3:libsmb: Modify cli_start_connection_connected() to use lp_cli_minprotocol()/lp_cli...
commit | commitdiff | tree
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>
(cherry picked from commit 42f510c155b98f3df5106aebd1de54d1749b9b1c)

10 years agos3:lib: remove unused interpret_protocol()
commit | commitdiff | tree
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>
(cherry picked from commit 9188ee4ab195a18b1bd697bced8613f98a6a91d9)

10 years agos3:torture: avoid interpret_protocol()
commit | commitdiff | tree
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>
(cherry picked from commit 2c3c8caa0cc7b085231b2edc100ce2332e1e0085)

10 years agos3:client: avoid interpret_protocol()
commit | commitdiff | tree
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>
(cherry picked from commit 861ee9319f3cce8f104fd30c7139323ac3d3319d)

next
Martin's Samba development