[SCM] Samba Shared Repository - branch v4-1-test updated
Karolin Seeger
kseeger at samba.org
Fri Aug 30 05:51:05 MDT 2013
The branch, v4-1-test has been updated
via ac1a309 client: add missing newlines to error messages for invalid iosize parameter.
via 5ba00cf Add documentation for the new internal command timeout to smbclient.
via b455784 Add documentation for the new -t <timeout> parameter in smbclient.
via 742c5c6 Fix the documentation of --encrypt to explain SMB3 encryption for smbclient.
via 4b3ce19 Fix the documentation of the iosize command to explain the new zero default for smbclient.
via bd16454 Fix the documentation for --send-buffersize for the new default value of zero for smbclient.
via 11890a5 Expand on the documentation of -m max-protocol for SMB2/3 for smbclient.
via cda1b51 Add "-e" encrypt transport command line option documentation for smbcacls.
via ff43be5 Add "max protocol" command line documentation for smbcacls.
via 69058ee Add new "timeout" command and -t option to smbclient to set the per-operation timeout.
via c0aed70 As SMB3 has transport level encryption, allow smbclient -e to force encryted SMB3 transport.
via 449503d Remove restrictions on setting iosize inside smbclient for SMB2 connections.
via 947cd1d libsmb: Fix a bunch of Coverity IDs
via 2fb817c s3:libsmb: call smb2cli_logoff() from cli_ulogoff()
via 159b051 s3:libsmb: make cli_ulogoff_send/recv static
via 409ab74 s3:libsmb: call smb2cli_tdis() from cli_tdis()
via 9d2ecfe s3:libsmb: only set tcon to invalid in smb2cli_tdis*
via c935ba3 s3:libsmb: make cli_tdis_send/recv static
via 26a1fd3 s3:libsmb: add support for SMB2 in cli_writeall()
via 1d0a87e s3:libsmb: add SMB2 support to cli_pull*
via e9d7054 s3:libsmb: add SMB2 support to cli_push*
via bd104ef s3:libsmb: Plumb cli_smb2_set_security_descriptor() inside cli_set_security_descriptor().
via c774061 s3:libsmb: Plumb cli_smb2_query_security_descriptor() inside cli_query_security_descriptor().
via 5ef4556 s3:libsmb: Plumb cli_smb2_qpathinfo_alt_name() inside cli_qpathinfo_alt_name().
via 919cb48 s3:libsmb: Plumb cli_smb2_qpathinfo_basic() inside cli_qpathinfo_basic().
via e7ff8b9 s3:libsmb: Plumb cli_smb2_qfileinfo_basic() inside cli_qfileinfo_basic().
via b8baf6d s3:libsmb: Plumb cli_smb2_qpathinfo_streams() inside cli_qpathinfo_streams().
via 509fe6d s3:libsmb: Plumb cli_smb2_qpathinfo2() inside cli_qpathinfo2().
via afb3b39 s3:libsmb: Plumb cli_smb2_list() inside cli_list().
via 056d800 s3:libsmb: Plumb cli_smb2_get_ea_list_path() inside cli_get_ea_list_path().
via a9d9142 s3:libsmb: Plumb cli_smb2_set_ea_fnum() inside cli_set_ea_fnum().
via 90c733a s3:libsmb: Plumb cli_smb2_set_ea_path() inside cli_set_ea_path().
via 663fa90 s3:libsmb: Fix cli_set_ea_path() to use frame instead of talloc_tos().
via 776e653 s3:libsmb: Plumb cli_smb2_dskattr() inside cli_dskattr().
via 65e9cb0 s3:libsmb: Plumb cli_smb2_getatr() inside cli_getatr().
via 79015d4 s3:libsmb: Plumb cli_smb2_setatr() inside cli_setatr().
via 40a7f2c s3:libsmb: Plumb cli_smb2_setattrE() inside cli_setattrE().
via 6a9b514 s3:libsmb: Plumb cli_smb2_getattrE() inside cli_getattrE().
via 6d938a2 s3:libsmb: Plumb cli_smb2_close_fnum() inside cli_close().
via c629546 s3:libsmb: Plumb cli_smb2_create_fnum() inside cli_ntcreate().
via 967357a s3:libsmb: Plumb cli_smb2_rmdir() inside cli_rmdir().
via ea30277 s3:libsmb: Plumb cli_smb2_mkdir() inside cli_mkdir().
via 5e14ff8 s3:libsmb: Plumb cli_smb2_unlink() inside cli_unlink().
via f041217 s3:libsmb: Plumb cli_smb2_rename() inside cli_rename().
via 086075e s3:libsmb: Add in the core of the libsmb client SMB2 functions.
via 2167e59 s3:lib: Factor read_ea_list_entry() and read_nttrans_ea_list() out so they can be used by the SMB2 client code.
via 7ff7f66 s3:client: fix compiler warning
via a06f581 s3:client: use the default io size
via a6b81a0 s3:libsmb: remove unused cli_readall*
via 21d0294 s3:libsmb: rewrite cli_pull* to use smb1cli_conn_req_possible()
via 21b1120 s3:libsmb: rewrite cli_push* to use smb1cli_conn_req_possible()
via c66525c libcli/smb: add smb2cli_conn_req_possible()
via 12b040b libcli/smb: add smb1cli_conn_req_possible()
via 60a05c0 libcli/smb: pass max_dyn_len to smb2cli_req_send()
via 0a880e0 libcli/smb: pass max_dyn_len to smb2cli_req_create()
via d0fbe4f libcli/smb: calculate the credit charge on the input and output dyn_len
via 72bfc65 libcli/smb: Change smb2cli_create() and smb2cli_create_recv() to return a parameter blob of the newly opened/created file.
via 0526566 libcli/smb: Fix smb2cli_write_recv() and smb2cli_write() to return the bytes written.
via 801bcd0 libcli/smb: fix the credit handling on a SMB1 => SMB2 negotiate
via d9f3bd2 s3:smbcacls: Add -m<MAX PROTOCOL> option to smbcacls.
via 98426d1 s3:libsmb: make use of lp_cli_{min,max}protocol() in SMBC_server_internal()
via bf02a46 s3:libsmb: use lp_cli_minprotocol() in do_connect()
via 58e621b s3:winbindd: make use of lp_cli_{min,max}protocol()
via f017d59 s3:lib/netapi: make use of lp_cli_maxprotocol()
via aadf310 s3:libsmb: Ensure we ask for DEFAULT_SMB2_MAX_CREDITS on successful negprot.
via a0ea1c0 s3:libsmb: Modify cli_start_connection_connected() to use lp_cli_minprotocol()/lp_cli_maxprotocol() instead of hard coding PROTOCOL_CORE, PROTOCOL_NT1.
via d0a5cf5 s3:lib: remove unused interpret_protocol()
via 88e1188 s3:torture: avoid interpret_protocol()
via 723bc67 s3:client: avoid interpret_protocol()
via ac26652 s3:param: Correctly set up cli_maxprotocol, cli_minprotocol in our parameter block.
via db6081f Fix the UNIX extensions CHOWN calls to use FCHOWN if available, else LCHOWN.
via d953374 Allow UNIX extensions client to act on open fsp instead of pathname if available.
via 954ecdf Fix the erroneous masking of chmod requests via the UNIX extensions.
via 163c0b3 s3:winbind: fail ads_cached_connection_connect() if realm == NULL
via 1c53cdd2 s3-winbindd: remove unneded include of secrets.h from idmap_ad.c
via b2276cd s3-winbindd: use get_trust_pw_clear() wrapper for AD connection code.
via 11fd36c s3-winbindd: make sure also the idmap code can deal with trusted domains.
via f486e86 s3-winbindd: use find_domain_from_name() instead of find_domain_from_name_no_init().
via ae20e2d s3-winbindd: Fix winbind on DC crash with trusted AD domains.
via ac40660 s3-winbindd: Fix memory leak in ads_cached_connection().
via a07ff7c s3-winbindd: remove pointless variable assigment, see the strdup below.
via 7c4011f smbd: Simplify dropbox special case in unix_convert
via 0fc78f9 smbd: Fix a profile problem
via 462cb9c docs: Add man samba-regedit.8.
from 6b6cab7 Fix bug #10063 - source3/lib/util.c:1493 leaking memory w/ pam_winbind.so / winbind
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-1-test
- Log -----------------------------------------------------------------
commit ac1a309256d55e794d388080a15df3b5a72e2469
Author: Michael Adam <obnox at samba.org>
Date: Wed Aug 21 16:12:30 2013 +0200
client: add missing newlines to error messages for invalid iosize parameter.
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at 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 at samba.org>
Autobuild-Date(v4-1-test): Fri Aug 30 13:50:13 CEST 2013 on sn-devel-104
commit 5ba00cf7aaa2bce2a15c7a60e379bb227363fe8e
Author: Jeremy Allison <jra at samba.org>
Date: Fri Aug 16 16:57:34 2013 -0700
Add documentation for the new internal command timeout to smbclient.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
Autobuild-User(master): Michael Adam <obnox at samba.org>
Autobuild-Date(master): Wed Aug 21 19:24:06 CEST 2013 on sn-devel-104
(cherry picked from commit 8d0392f9f7973e72a6082d66f81180d19eb0a56f)
commit b455784cf3e87c8e1b511937a6b75139ba11fe3c
Author: Jeremy Allison <jra at samba.org>
Date: Fri Aug 16 16:56:22 2013 -0700
Add documentation for the new -t <timeout> parameter in smbclient.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
(cherry picked from commit f7dc59b3ad293105756433ef52c67e195eb49361)
commit 742c5c670b5c86f40f0a4f133f3dc2fc5580f620
Author: Jeremy Allison <jra at samba.org>
Date: Fri Aug 16 16:53:45 2013 -0700
Fix the documentation of --encrypt to explain SMB3 encryption for smbclient.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 4044e2beb7145afb261c98e100574e4e842e1b9e)
commit 4b3ce19117b3c33986b1876b53272b502289fe13
Author: Jeremy Allison <jra at samba.org>
Date: Fri Aug 16 16:49:41 2013 -0700
Fix the documentation of the iosize command to explain the new zero default for smbclient.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 90566fd0deb8768acc96b0a0bc573183c4db20ef)
commit bd164547c1d23b2fe1516df04d13530cd2d2fadc
Author: Jeremy Allison <jra at samba.org>
Date: Fri Aug 16 16:48:18 2013 -0700
Fix the documentation for --send-buffersize for the new default value of zero for smbclient.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 659f5fecd69fb240c1a2ea385584c22d00476b59)
commit 11890a519ab579790d0c14835639d03d09cad24d
Author: Jeremy Allison <jra at samba.org>
Date: Fri Aug 16 16:47:13 2013 -0700
Expand on the documentation of -m max-protocol for SMB2/3 for smbclient.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 252a6b6d8a27f4b8be61c6b091318ddb76776471)
commit cda1b516f0c58460e126d275d5305620d5777202
Author: Jeremy Allison <jra at samba.org>
Date: Fri Aug 16 16:45:26 2013 -0700
Add "-e" encrypt transport command line option documentation for smbcacls.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 5b60d95abc767131b97151f03d7f668c81e728cb)
commit ff43be5bdd90a1da3a04f26606353341ca7b8ed0
Author: Jeremy Allison <jra at samba.org>
Date: Fri Aug 16 16:44:14 2013 -0700
Add "max protocol" command line documentation for smbcacls.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 646ed6884c91cde7c9aec6fdb1a25d0e6a0898d0)
commit 69058ee134e591e0d77d8046a3311d91adaf1e85
Author: Jeremy Allison <jra at samba.org>
Date: Fri Aug 16 13:49:39 2013 -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 at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
(cherry picked from commit d9c88a56dc451be09e8c9fc9aa8857e312fcb444)
commit c0aed70534142e3c9c2ad8b4290b3360119f5f25
Author: Jeremy Allison <jra at samba.org>
Date: Fri Aug 16 10:44:34 2013 -0700
As SMB3 has transport level encryption, allow smbclient -e to force encryted SMB3 transport.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 81e1058e20bcfc1efab2b39dd7642d8dbbe0cb3b)
commit 449503d092974f03c882e55e9bd297590dd53f3e
Author: Jeremy Allison <jra at samba.org>
Date: Fri Aug 16 11:45:43 2013 -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 at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 25521c90859de0651216c459273b2ffd916ee299)
commit 947cd1d17e680ea31a22fd98e1713ad02f2919ba
Author: Volker Lendecke <vl at samba.org>
Date: Mon Aug 19 22:36:02 2013 +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 at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Tue Aug 20 00:52:36 CEST 2013 on sn-devel-104
(cherry picked from commit 4f96d5753ffe6c446c46676ba31cd2a3722890a0)
commit 2fb817c55b0dca708b316e920f1be1d1ed708e68
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Aug 14 15:18:47 2013 -0700
s3:libsmb: call smb2cli_logoff() from cli_ulogoff()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Thu Aug 15 10:53:21 CEST 2013 on sn-devel-104
(cherry picked from commit b706ca6e55aa76d4da901c69d991969602facc3b)
commit 159b0517ed60a8951ff8aca9696f6e4b67720c28
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Aug 14 11:48:40 2013 +0200
s3:libsmb: make cli_ulogoff_send/recv static
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 1d7bdfc4feac35d92b003c3c78f502897ecc5d4e)
commit 409ab7423ac30f164c59954935e841898030cb9a
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Aug 14 11:44:58 2013 +0200
s3:libsmb: call smb2cli_tdis() from cli_tdis()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit e6be68fb5e4dc528f7365f3413b9b66090992f42)
commit 9d2ecfe985b38e4f97d78b8b3f6d339e1fb3d25f
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Aug 14 11:44:10 2013 +0200
s3:libsmb: only set tcon to invalid in smb2cli_tdis*
This matches the behavior of cli_tdis*.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit d732e9aab3bbad3ea97f8b120e57b41152aaee3b)
commit c935ba33b1fc0db72e617d122b1f6c43b84b4f0d
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Aug 14 11:38:22 2013 +0200
s3:libsmb: make cli_tdis_send/recv static
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 80d4f64352c0ddacb9ee15d2b48a42a0b7929501)
commit 26a1fd3d60ee281fd045aa6605a417e51e6dfabc
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Aug 13 18:38:57 2013 +0200
s3:libsmb: add support for SMB2 in cli_writeall()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit ccf7b3719121e03ed06d15b9af5373eecba3e828)
commit 1d0a87ebd020b2b04210e9c8065c0b3ad2a7508e
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Aug 13 18:20:08 2013 +0200
s3:libsmb: add SMB2 support to cli_pull*
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit a85d4511e6bc84938d60f090b44a5b1468ee4136)
commit e9d7054d3caa0198ee37c8fc9156904b7fdebd2c
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Aug 13 16:33:30 2013 +0200
s3:libsmb: add SMB2 support to cli_push*
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 6896bf0b28a07eb8ead5b3bd2bc50229aa59d439)
commit bd104ef55edd35fd365c138e8ffd6f4411bc88fa
Author: Jeremy Allison <jra at samba.org>
Date: Thu Aug 8 11:00:49 2013 -0700
s3:libsmb: Plumb cli_smb2_set_security_descriptor() inside cli_set_security_descriptor().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 80758e4b07c87280e778ba161c2c9c4a2ee47853)
commit c774061323523cc1f03e5ad93516a6b52f24aa64
Author: Jeremy Allison <jra at samba.org>
Date: Thu Aug 8 11:00:08 2013 -0700
s3:libsmb: Plumb cli_smb2_query_security_descriptor() inside cli_query_security_descriptor().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 1db7e90451f31d75298508c19a859d98d56d7e7c)
commit 5ef4556a1a258ffd27b2b5da72b98fcf58356255
Author: Jeremy Allison <jra at samba.org>
Date: Wed Aug 7 16:50:03 2013 -0700
s3:libsmb: Plumb cli_smb2_qpathinfo_alt_name() inside cli_qpathinfo_alt_name().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit de895bf228432f2a42bcdcadcf12ffd1be64022f)
commit 919cb48c3526e56dffa373da53c34018911adcab
Author: Jeremy Allison <jra at samba.org>
Date: Thu Aug 8 10:52:02 2013 -0700
s3:libsmb: Plumb cli_smb2_qpathinfo_basic() inside cli_qpathinfo_basic().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit cba3ed0466b8598e28a44809778b99e97b1bf1a1)
commit e7ff8b90082ff29ef0930ac1839d1e111d0936e4
Author: Jeremy Allison <jra at samba.org>
Date: Wed Aug 7 16:47:21 2013 -0700
s3:libsmb: Plumb cli_smb2_qfileinfo_basic() inside cli_qfileinfo_basic().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 2bb3e251d59910d9bf527a73271094702bceefe2)
commit b8baf6d87dd3beb699bf60b43a72199240487357
Author: Jeremy Allison <jra at samba.org>
Date: Wed Aug 7 16:46:05 2013 -0700
s3:libsmb: Plumb cli_smb2_qpathinfo_streams() inside cli_qpathinfo_streams().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit e96309ca1b057d430444531523bb2c9f59fcd624)
commit 509fe6d1414674965bcd3284f4ef8c262a304a03
Author: Jeremy Allison <jra at samba.org>
Date: Wed Aug 7 16:45:05 2013 -0700
s3:libsmb: Plumb cli_smb2_qpathinfo2() inside cli_qpathinfo2().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit f2f566b1cc8d55bd1cf93478b877a3e7f455855c)
commit afb3b39cfc131d79a8653158070045cbc4e74c26
Author: Jeremy Allison <jra at samba.org>
Date: Wed Aug 7 16:43:33 2013 -0700
s3:libsmb: Plumb cli_smb2_list() inside cli_list().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 73255d3ba912b3a112f9d766deae895f51e16cd9)
commit 056d800bc7b06aaa2fd3e98323c6a056f0eb84d1
Author: Jeremy Allison <jra at samba.org>
Date: Wed Aug 7 16:42:02 2013 -0700
s3:libsmb: Plumb cli_smb2_get_ea_list_path() inside cli_get_ea_list_path().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 7e2d969deb1d4bcf3add422d80852b2d386cfaac)
commit a9d914249a7e1a6a94b0361cd814594d3a285b52
Author: Jeremy Allison <jra at samba.org>
Date: Wed Aug 7 16:32:55 2013 -0700
s3:libsmb: Plumb cli_smb2_set_ea_fnum() inside cli_set_ea_fnum().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit f8dfc50124e5b5083aa801d9658389dd3fa6698a)
commit 90c733ac94b78b2be43033894ecb1932aa9db213
Author: Jeremy Allison <jra at samba.org>
Date: Wed Aug 7 16:21:48 2013 -0700
s3:libsmb: Plumb cli_smb2_set_ea_path() inside cli_set_ea_path().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 3276853e59c2686873baad7c6f9d2665ed6fdd56)
commit 663fa90e4f5037d873842bdc9e4b8c7c609937f6
Author: Jeremy Allison <jra at samba.org>
Date: Wed Aug 7 16:19:06 2013 -0700
s3:libsmb: Fix cli_set_ea_path() to use frame instead of talloc_tos().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit c1aeada4dd1f165eb33354c5a4323ed1ebf453a9)
commit 776e653ad9f1d4859f2157319338d3b359a9a1a0
Author: Jeremy Allison <jra at samba.org>
Date: Wed Aug 7 16:17:12 2013 -0700
s3:libsmb: Plumb cli_smb2_dskattr() inside cli_dskattr().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit c6ed0b88312d7e231749a09a87944caea4c9808e)
commit 65e9cb0d465095138700ca90d1ed4196e889b66d
Author: Jeremy Allison <jra at samba.org>
Date: Wed Aug 14 14:37:11 2013 -0700
s3:libsmb: Plumb cli_smb2_getatr() inside cli_getatr().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 75d2e18502ccb811c018535f3c5c7325bdf5e613)
commit 79015d46fa310d21263f018c7ffcde72037a8302
Author: Jeremy Allison <jra at samba.org>
Date: Wed Aug 7 16:16:03 2013 -0700
s3:libsmb: Plumb cli_smb2_setatr() inside cli_setatr().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit ea267a7e4b4c413336b2bf54eb53ffc8d1524b44)
commit 40a7f2cd6e16f8ac208a7fa9503ee2c65963adc8
Author: Jeremy Allison <jra at samba.org>
Date: Wed Aug 7 16:14:47 2013 -0700
s3:libsmb: Plumb cli_smb2_setattrE() inside cli_setattrE().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 83c410c99e3ef8db00dd002c1a1a93b0035cd2e7)
commit 6a9b51455351243d5efce6c8a9846c3017cd86ea
Author: Jeremy Allison <jra at samba.org>
Date: Wed Aug 7 16:11:59 2013 -0700
s3:libsmb: Plumb cli_smb2_getattrE() inside cli_getattrE().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 0bbc0446210fa504f9834de948c4d066df752666)
commit 6d938a2a33f387d43fe66a72ad6296a1960bcdd7
Author: Jeremy Allison <jra at samba.org>
Date: Wed Aug 7 16:10:34 2013 -0700
s3:libsmb: Plumb cli_smb2_close_fnum() inside cli_close().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 85f60cc3d8f68ce5eb687cc6e367bb66bdef8b99)
commit c6295466ef37cff52900c306e88de16f5839ba0b
Author: Jeremy Allison <jra at samba.org>
Date: Wed Aug 7 16:06:19 2013 -0700
s3:libsmb: Plumb cli_smb2_create_fnum() inside cli_ntcreate().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit c1c4491d5e5bb16c274fe4fe162156a7ec910b93)
commit 967357af76fee2c6bbd5921d7c5c1aa04b3399a6
Author: Jeremy Allison <jra at samba.org>
Date: Wed Aug 7 16:03:00 2013 -0700
s3:libsmb: Plumb cli_smb2_rmdir() inside cli_rmdir().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 04d396566b90f32dc239450596ab50502f9cbb02)
commit ea30277c345ac88895ab871a38b3a275fe41947a
Author: Jeremy Allison <jra at samba.org>
Date: Wed Aug 7 16:01:49 2013 -0700
s3:libsmb: Plumb cli_smb2_mkdir() inside cli_mkdir().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 46da267afd540fe2d31f1395cda9e2853cf6432a)
commit 5e14ff81f8f33794c814b00511f075b0e01a032c
Author: Jeremy Allison <jra at samba.org>
Date: Wed Aug 7 16:00:40 2013 -0700
s3:libsmb: Plumb cli_smb2_unlink() inside cli_unlink().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 179c27dd0235c4949045eef2ffb7a87175a4483b)
commit f041217dd1cb11431b2de43094a2d2b8bc801333
Author: Jeremy Allison <jra at samba.org>
Date: Wed Aug 7 15:59:13 2013 -0700
s3:libsmb: Plumb cli_smb2_rename() inside cli_rename().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit c748a959b40f184190cd537f0ad5f0772b484841)
commit 086075ee43cd6790c2c789a33319cba054a4b751
Author: Jeremy Allison <jra at samba.org>
Date: Wed Aug 7 15:54:05 2013 -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 at samba.org>
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 28591dfd5d2163d9181d45d64a4a750e335b7c56)
commit 2167e599867c787917acb4595ad718f55606fcba
Author: Jeremy Allison <jra at samba.org>
Date: Wed Aug 7 13:48:55 2013 -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 at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit c80349e0fad7c182b0bddefed99a78d95323faca)
commit 7ff7f664d39256e57c2b56f31911b12aae4dff20
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Aug 14 10:47:11 2013 +0200
s3:client: fix compiler warning
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 2394f8788d2f6e21064db0b6099a0dbe3a33e1d6)
commit a06f581df37cc7c180a34be5aa1fead898a0c27b
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Aug 14 10:46:28 2013 +0200
s3:client: use the default io size
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 9b4692f2d057f31f76db0bdf7c4a515db057e2dd)
commit a6b81a0f806b274a13a6388765ac514020fd0ef7
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Aug 13 18:23:55 2013 +0200
s3:libsmb: remove unused cli_readall*
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 9193a58375691bfca9e3cce1ff61b2b6dd65a982)
commit 21d0294536c9c5a2c266aae1fe342879cc59f227
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Aug 13 18:03:50 2013 +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 at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 8062aefbe3c2fcc73e3d19af6663c8736c570f7c)
commit 21b11208bc446b5fcb0c06cddd0bbf8b6e24d4ce
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Aug 13 14:10:59 2013 +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 at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit b846b3acd2b217a0d67c1e8fcb039e03498c4e47)
commit c66525ceb3ca896dabd5a0edfae68626143b3e1d
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Aug 13 15:49:19 2013 +0200
libcli/smb: add smb2cli_conn_req_possible()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 7efdc323d1a1abdae70bcafefe07b3cffcdb2521)
commit 12b040b44f58c517253b78f30ca10630d90dc91d
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Aug 13 14:05:05 2013 +0200
libcli/smb: add smb1cli_conn_req_possible()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 111f529a2a5832b822445bb4f63b142d8ccb2cb7)
commit 60a05c0b673beda3d2a8481fac8bbbe04882b820
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Aug 13 10:25:52 2013 +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 at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 44b53937d59842a63e2cbfa92219f4f519530b0a)
commit 0a880e0433867e7fb66422213a18c6d0f7cae60c
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Aug 13 09:54:42 2013 +0200
libcli/smb: pass max_dyn_len to smb2cli_req_create()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 4a3352020db962ef40728d8a754da8a9418ca8a7)
commit d0fbe4f2fc4c1d22d5378117a6b266bc4cb846d5
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Aug 13 09:50:29 2013 +0200
libcli/smb: calculate the credit charge on the input and output dyn_len
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 318735fd5e15c5fd7010c0f657c86d27b45279ac)
commit 72bfc65cd422c0b789cfa43e89a1bfb48067dd78
Author: Jeremy Allison <jra at samba.org>
Date: Wed Aug 7 15:01:50 2013 -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 at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 1229881df6bd22d4b5055ad283061332ba1c9bc8)
commit 05265666cf98c5a5e8d5302cbb2a636c966f5734
Author: Jeremy Allison <jra at samba.org>
Date: Wed Aug 7 14:41:24 2013 -0700
libcli/smb: Fix smb2cli_write_recv() and smb2cli_write() to return the bytes written.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 00f784ec91d2cfa95b20327ac20f5bc3fa1f400e)
commit 801bcd084f3f3ed91668d95e9c1228e16b0b5691
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Aug 14 08:12:08 2013 +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 at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 97288b7f1048c1bf712463293a1e62737738292c)
commit d9f3bd248940263e6a108cfcc61a3adeb3e7de6b
Author: Jeremy Allison <jra at samba.org>
Date: Thu Aug 8 11:43:16 2013 -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 at samba.org>
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit f6ce50a8aca9eb024af4eb5e3dd620fe5e04e913)
commit 98426d11ffbb562ff259244d39447d4ca3083eb1
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Aug 11 14:01:36 2013 +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 at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit daeb0bdfc49ace6151bbca34cbbf55486d66abb6)
commit bf02a469c3c9a71fe2741bcd53d6d478f52e2311
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Aug 11 14:00:45 2013 +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 at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 42a493dff0e4ade04b6e94caf0b7ae14b6cf60eb)
commit 58e621beb37bbda12d8ce50aca20f7317313e6a2
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Aug 11 13:48:31 2013 +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 at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit dd9155a7ec7f1989cb18e79907d0fa1c9ee845a4)
commit f017d5941a2d8491f299fe0ccd6dffc988472885
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Aug 11 13:46:34 2013 +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 at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 7e455e9ed2b298df6b735a89abdd75564375ef34)
commit aadf3106a2eeb515d39f8b636a4e5e3dee4b639e
Author: Jeremy Allison <jra at samba.org>
Date: Fri Aug 9 11:15:48 2013 -0700
s3:libsmb: Ensure we ask for DEFAULT_SMB2_MAX_CREDITS on successful negprot.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 14421323d1dd3744cb8553f0e6a5a7436554bf2d)
commit a0ea1c0671e87996170963c231a341357e618d55
Author: Jeremy Allison <jra at samba.org>
Date: Thu Aug 8 11:35:44 2013 -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 at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 42f510c155b98f3df5106aebd1de54d1749b9b1c)
commit d0a5cf54479b1118b97865c47e1d68bc74fded5e
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Aug 11 13:11:41 2013 +0200
s3:lib: remove unused interpret_protocol()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 9188ee4ab195a18b1bd697bced8613f98a6a91d9)
commit 88e1188733704470a513ecdc4080dff7ce21cb52
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Aug 11 13:10:13 2013 +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 at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 2c3c8caa0cc7b085231b2edc100ce2332e1e0085)
commit 723bc67d244a65025a9f4f438bdb125d142e04a1
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Aug 11 13:08:49 2013 +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 at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 861ee9319f3cce8f104fd30c7139323ac3d3319d)
commit ac26652f6b50f5688b84904786e09979ca236b4a
Author: Jeremy Allison <jra at samba.org>
Date: Wed Aug 7 15:17:01 2013 -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 at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit f2fb829cee81996c62ff91cb8d1e9997008ffb42)
commit db6081fff3c98c2f28a9ce2f6fcf9ef0b2242b1e
Author: Jeremy Allison <jra at samba.org>
Date: Wed Aug 21 12:20:48 2013 -0700
Fix the UNIX extensions CHOWN calls to use FCHOWN if available, else LCHOWN.
UNIX extensions calls must never deref links.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Simo Sorce <idra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Mon Aug 26 20:19:46 CEST 2013 on sn-devel-104
(cherry picked from commit d1593a20f3a5ebf287477dfa8f5ab31dca3dd0c3)
The last 3 patches address bug #10121 - masks incorrectly applied to UNIX
extension permission changes.
commit d953374b709db9099ee11b6f8c0bd69f8699d532
Author: Jeremy Allison <jra at samba.org>
Date: Wed Aug 21 12:10:05 2013 -0700
Allow UNIX extensions client to act on open fsp instead of pathname if available.
Eliminates possible race condition on pathname op.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Simo Sorce <idra at samba.org>
(cherry picked from commit f1ff97fc022adaacaa23b7da250be6f7d51c6ac7)
commit 954ecdf426a98403683ef5098b8aae4611805774
Author: Jeremy Allison <jra at samba.org>
Date: Wed Aug 21 12:03:25 2013 -0700
Fix the erroneous masking of chmod requests via the UNIX extensions.
Changed from switch statement to if, as "create mask", "force create mode"
are only applied to new files, not existing ones. "directory mask",
"force directory mode" are only applied to new directories, not existing
ones.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Simo Sorce <idra at samba.org>
(cherry picked from commit bd0156988b34feaf91c3046f7ec78f0833222395)
commit 163c0b31b9b1c9b9c9bbecd8ec8c65f6a09ed8b0
Author: Michael Adam <obnox at samba.org>
Date: Thu Aug 29 16:38:08 2013 +0200
s3:winbind: fail ads_cached_connection_connect() if realm == NULL
This prevents segfaults when e.g. a previous SMB_STRDUP failed..
Signed-off-by: Michael Adam <obnox at samba.org>
The last 8 patches address bug #10107 - winbind on DC with trusted AD domains
crashes.
commit 1c53cdd2eef878b31b73cd68b1e4c5ca749fd809
Author: Günther Deschner <gd at samba.org>
Date: Wed Aug 28 14:53:08 2013 +0200
s3-winbindd: remove unneded include of secrets.h from idmap_ad.c
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit b2276cdd890454a7a5754c316fba12e4d3c5489f
Author: Günther Deschner <gd at samba.org>
Date: Wed Aug 28 14:53:08 2013 +0200
s3-winbindd: use get_trust_pw_clear() wrapper for AD connection code.
This avoids calling secrets functions directly.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 11fd36c5183587847919d8a0130795a115eb63b1
Author: Günther Deschner <gd at samba.org>
Date: Fri Aug 23 14:56:17 2013 +0200
s3-winbindd: make sure also the idmap code can deal with trusted domains.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit f486e864dd8608976fb405c328dc0e811d374685
Author: Günther Deschner <gd at samba.org>
Date: Wed Aug 28 15:00:06 2013 +0200
s3-winbindd: use find_domain_from_name() instead of find_domain_from_name_no_init().
Otherwise there is a good chance the domain has not been connected and we don't
know the realm name yet.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit ae20e2d0918fd321f0bd9cfe88d5f15ab6e585b0
Author: Günther Deschner <gd at samba.org>
Date: Thu Aug 22 16:36:27 2013 +0200
s3-winbindd: Fix winbind on DC crash with trusted AD domains.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit ac4066031fcc6faf44b64938a49c6cce9cb1294f
Author: Günther Deschner <gd at samba.org>
Date: Fri Aug 23 12:33:53 2013 +0200
s3-winbindd: Fix memory leak in ads_cached_connection().
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit a07ff7cb195db67c12feb503639d7593d4b32e1a
Author: Günther Deschner <gd at samba.org>
Date: Thu Aug 22 15:39:08 2013 +0200
s3-winbindd: remove pointless variable assigment, see the strdup below.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 7c4011fefd40547ba7dce279ca33da047f421f49
Author: Volker Lendecke <vl at samba.org>
Date: Mon Aug 19 10:26:00 2013 +0000
smbd: Simplify dropbox special case in unix_convert
EACCESS needs special treatment: If we want to create a fresh file,
return OBJECT_PATH_NOT_FOUND, so that the client will continue creating
the file. If the client wants us to open a potentially existing file,
we need to correctly return ACCESS_DENIED.
This patch makes this behaviour hopefully a bit clearer than the code
before did.
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Volker Lendecke <vl at samba.org>
Autobuild-Date(master): Mon Aug 26 12:14:26 CEST 2013 on sn-devel-104
The last 2 patches address bug #10114 - Dropbox (write-only-directory) case isn't
handled correctly in pathname lookup.
commit 0fc78f9ff234dbe9ada9a03d0c7249ccb46cb776
Author: Volker Lendecke <Volker.Lendecke at SerNet.DE>
Date: Tue Jul 9 11:02:39 2013 -0700
smbd: Fix a profile problem
When trying to read a profile, under certain circumstances Windows tries
to read with its machine account first. The profile previously written
was stored with an ACL that only allows access for the user and not
the machine. Windows should get an NT_STATUS_ACCESS_DENIED when using
the machine account, making it retry with the user account (which would
then succeed).
Samba under these circumstances erroneously gives
NT_STATUS_OBJECT_PATH_NOT_FOUND, which makes Windows give up and not
retry. The reasons is the "dropbox" patch in unix_convert, turning EACCESS
on the last path component to OBJECT_PATH_NOT_FOUND. This patch makes
the dropbox behaviour only kick in when we are creating a file. I think
this is an abstraction violation. unix_convert() should not have to know
about the create_disposition, but given that we have pathname resolution
separated from the core open code right now this is the best we can do.
Signed-off-by: Volker Lendecke <Volker.Lendecke at SerNet.DE>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 462cb9ccb5d27edcd59b8d680cb840cedae6291d
Author: Karolin Seeger <kseeger at samba.org>
Date: Thu Aug 22 12:55:53 2013 +0200
docs: Add man samba-regedit.8.
Fix bug #10001 - Man page for samba-regedit tool missing.
Signed-off-by: Karolin Seeger <kseeger at samba.org>
Signed-off-by: Björn Jacke <bj at sernet.de>
Autobuild-User(master): Björn Jacke <bj at sernet.de>
Autobuild-Date(master): Thu Aug 29 03:15:51 CEST 2013 on sn-devel-104
(cherry picked from commit 4dd1523b95b214723dc9c0dfc5b5a6778bf4fc4d)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages/samba-regedit.8.xml | 121 +
docs-xml/manpages/smbcacls.1.xml | 27 +
docs-xml/manpages/smbclient.1.xml | 77 +-
docs-xml/wscript_build | 1 +
libcli/smb/smb2_create_blob.h | 12 +
libcli/smb/smb2cli_close.c | 3 +-
libcli/smb/smb2cli_create.c | 52 +-
libcli/smb/smb2cli_echo.c | 3 +-
libcli/smb/smb2cli_flush.c | 3 +-
libcli/smb/smb2cli_ioctl.c | 13 +-
libcli/smb/smb2cli_query_directory.c | 3 +-
libcli/smb/smb2cli_query_info.c | 3 +-
libcli/smb/smb2cli_read.c | 3 +-
libcli/smb/smb2cli_session.c | 6 +-
libcli/smb/smb2cli_set_info.c | 3 +-
libcli/smb/smb2cli_write.c | 33 +-
libcli/smb/smbXcli_base.c | 95 +-
libcli/smb/smbXcli_base.h | 22 +-
source3/client/client.c | 86 +-
source3/include/client.h | 1 +
source3/include/proto.h | 3 +-
source3/lib/netapi/cm.c | 2 +-
source3/lib/util.c | 25 -
source3/lib/util_ea.c | 126 ++
.../libcli/raw/rawlpq.c => source3/lib/util_ea.h | 44 +-
source3/libsmb/cli_np_tstream.c | 10 +-
source3/libsmb/cli_smb2_fnum.c | 2373 ++++++++++++++++++++
source3/libsmb/cli_smb2_fnum.h | 161 ++
source3/libsmb/cliconnect.c | 37 +-
source3/libsmb/clidfs.c | 26 +-
source3/libsmb/clifile.c | 158 ++-
source3/libsmb/clilist.c | 8 +-
source3/libsmb/clirap.c | 64 +-
source3/libsmb/clirap.h | 4 +
source3/libsmb/clireadwrite.c | 908 +++++----
source3/libsmb/clisecdesc.c | 16 +
source3/libsmb/libsmb.h | 1 +
source3/libsmb/libsmb_server.c | 6 +-
source3/libsmb/proto.h | 8 -
source3/libsmb/smb2cli_tcon.c | 9 +-
source3/param/loadparm.c | 2 +
source3/smbd/filename.c | 28 +-
source3/smbd/nttrans.c | 50 +-
source3/smbd/reply.c | 48 +-
source3/smbd/smb2_create.c | 3 +-
source3/smbd/smbd.h | 1 +
source3/smbd/trans2.c | 115 +-
source3/torture/masktest.c | 5 +-
source3/torture/test_smb2.c | 62 +-
source3/torture/torture.c | 3 +-
source3/utils/smbcacls.c | 4 +
source3/winbindd/idmap_ad.c | 1 -
source3/winbindd/winbindd_ads.c | 62 +-
source3/winbindd/winbindd_cm.c | 5 +-
source3/wscript_build | 6 +-
source4/libcli/smb2/transport.c | 9 +-
56 files changed, 4165 insertions(+), 795 deletions(-)
create mode 100644 docs-xml/manpages/samba-regedit.8.xml
create mode 100644 source3/lib/util_ea.c
copy source4/libcli/raw/rawlpq.c => source3/lib/util_ea.h (61%)
create mode 100644 source3/libsmb/cli_smb2_fnum.c
create mode 100644 source3/libsmb/cli_smb2_fnum.h
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages/samba-regedit.8.xml b/docs-xml/manpages/samba-regedit.8.xml
new file mode 100644
index 0000000..e7ec761
--- /dev/null
+++ b/docs-xml/manpages/samba-regedit.8.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="samba-regedit.8">
+
+<refmeta>
+ <refentrytitle>samba-regedit</refentrytitle>
+ <manvolnum>8</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">4.1</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+ <refname>samba-regedit</refname>
+ <refpurpose>ncurses based tool to manage the Samba registry</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <cmdsynopsis>
+ <command>samba-regedit</command>
+ <arg choice="opt">--help</arg>
+ <arg choice="opt">--usage</arg>
+ <arg choice="opt">-d <debug level></arg>
+ <arg choice="opt">-s <configuration file></arg>
+ <arg choice="opt">-l <log directory></arg>
+ <arg choice="opt">-V</arg>
+ <arg choice="opt">--option=<parameter>=<value></arg>
+ <arg choice="opt">--socket-options=<SOCKETOPTIONS></arg>
+ <arg choice="opt">--netbiosname=<NETBIOSNAME></arg>
+ <arg choice="opt">--workgroup=<WORKGROUP></arg>
+ <arg choice="opt">--scope=<SCOPE></arg>
+ <arg choice="opt">--user=<USERNAME></arg>
+ <arg choice="opt">-N</arg>
+ <arg choice="opt">-k</arg>
+ <arg choice="opt">--authentication-file=<FILE></arg>
+ <arg choice="opt">--signing=[on|off|required]</arg>
+ <arg choice="opt">-P</arg>
+ <arg choice="opt">-e</arg>
+ <arg choice="opt">-C</arg>
+ <arg choice="opt">--pw-nt-hash</arg>
+ </cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This tool is part of the <citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>7</manvolnum></citerefentry> suite.</para>
+ <para><command>samba-regedit</command> is a ncurses based tool to manage the Samba
+ registry. It can be used to show/edit registry keys/subkeys and
+ their values.</para>
+</refsect1>
+
+<refsect1>
+ <title>OPTIONS</title>
+ <variablelist>
+ &stdarg.help;
+ <varlistentry>
+ <term>--usage</term>
+ <listitem><para>Display brief usage message.</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>-d|--debuglevel=<debuglevel></term>
+ <listitem><para>Set debug level.</para></listitem>
+ </varlistentry>
+ &popt.common.samba;
+ <varlistentry>
+ <term>--option=<parameter>=<value></term>
+ <listitem><para>Set smb.conf option from command line.</para></listitem>
+ </varlistentry>
+ &popt.common.connection;
+ <varlistentry>
+ <term>-S|--signing</term>
+ <listitem><para>Set the client signing state.</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>-P|--machine-pass</term>
+ <listitem><para>Use stored machine account password.</para></listitem>
+ </varlistentry>
+ &popt.common.credentials;
+ <varlistentry>
+ <term>-e|--encrypt</term>
+ <listitem><para>Encrypt SMB transport (UNIX extended servers only).</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>--pw-nt-hash</term>
+ <listitem><para>The supplied password is the NT hash.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+</refsect1>
+
+
+<refsect1>
+ <title>VERSION</title>
+
+ <para>This man page is correct for version 4 of the Samba suite.</para>
+</refsect1>
+
+<refsect1>
+ <title>SEE ALSO</title>
+ <para><citerefentry><refentrytitle>smbd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>7</manvolnum></citerefentry> and <citerefentry><refentrytitle>net</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry>.</para>
+</refsect1>
+
+<refsect1>
+ <title>AUTHOR</title>
+
+ <para>The original Samba software and related utilities
+ were created by Andrew Tridgell. Samba is now developed
+ by the Samba Team as an Open Source project similar
+ to the way the Linux kernel is developed.</para>
+
+ <para>The samba-regedit man page was written by Karolin Seeger.</para>
+</refsect1>
+
+</refentry>
diff --git a/docs-xml/manpages/smbcacls.1.xml b/docs-xml/manpages/smbcacls.1.xml
index 91a1806..22b55cc 100644
--- a/docs-xml/manpages/smbcacls.1.xml
+++ b/docs-xml/manpages/smbcacls.1.xml
@@ -33,6 +33,8 @@
<arg choice="opt">-U username</arg>
<arg choice="opt">-h</arg>
<arg choice="opt">-d</arg>
+ <arg choice="opt">-e</arg>
+ <arg choice="opt">-m|--max-protocol LEVEL</arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -139,6 +141,31 @@
</varlistentry>
<varlistentry>
+ <term>-e</term>
+ <listitem><para>This command line parameter requires the remote
+ server support the UNIX extensions or that the SMB3 protocol has been selected.
+ Requests that the connection be encrypted. Negotiates SMB encryption using either
+ SMB3 or POSIX extensions via GSSAPI. Uses the given credentials for
+ the encryption negotiation (either kerberos or NTLMv1/v2 if given
+ domain/username/password triple. Fails the connection if encryption
+ cannot be negotiated.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-m|--max-protocol PROTOCOL_NAME</term>
+ <listitem><para>This allows the user to select the
+ highest SMB protocol level that smbcacls will use to
+ connect to the server. By default this is set to
+ NT1, which is the highest available SMB1 protocol.
+ To connect using SMB2 or SMB3 protocol, use the
+ strings SMB2 or SMB3 respectively. Note that to connect
+ to a Windows 2012 server with encrypted transport selecting
+ a max-protocol of SMB3 is required.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>-t|--test-args</term>
<listitem><para>
Don't actually do anything, only validate the correctness of
diff --git a/docs-xml/manpages/smbclient.1.xml b/docs-xml/manpages/smbclient.1.xml
index 328fd50..425cc4b 100644
--- a/docs-xml/manpages/smbclient.1.xml
+++ b/docs-xml/manpages/smbclient.1.xml
@@ -37,6 +37,7 @@
<arg choice="opt">-p port</arg>
<arg choice="opt">-R <name resolve order></arg>
<arg choice="opt">-s <smb config file></arg>
+ <arg choice="opt">-t <per-operation timeout in seconds></arg>
<arg choice="opt">-k</arg>
<arg choice="opt">-P</arg>
<arg choice="opt">-c <command></arg>
@@ -67,6 +68,7 @@
<arg choice="opt">-p port</arg>
<arg choice="opt">-R <name resolve order></arg>
<arg choice="opt">-s <smb config file></arg>
+ <arg choice="opt">-t <per-operation timeout in seconds></arg>
<arg choice="opt">-T<c|x>IXFqgbNan</arg>
<arg choice="opt">-k</arg>
</cmdsynopsis>
@@ -256,7 +258,14 @@
<varlistentry>
<term>-m|--max-protocol protocol</term>
- <listitem><para>This parameter sets the maximum protocol version announced by the client.
+ <listitem><para>This allows the user to select the
+ highest SMB protocol level that smbclient will use to
+ connect to the server. By default this is set to
+ NT1, which is the highest available SMB1 protocol.
+ To connect using SMB2 or SMB3 protocol, use the
+ strings SMB2 or SMB3 respectively. Note that to connect
+ to a Windows 2012 server with encrypted transport selecting
+ a max-protocol of SMB3 is required.
</para></listitem>
</varlistentry>
@@ -309,22 +318,29 @@
<varlistentry>
<term>-b|--send-buffer buffersize</term>
- <listitem><para>This option changes the transmit/send buffer
- size when getting or putting a file from/to the server. The default
- is 65520 bytes. Setting this value smaller (to 1200 bytes) has been
- observed to speed up file transfers to and from a Win9x server.
+ <listitem><para>
+ When sending or receiving files, smbclient uses an
+ internal buffer sized by the maximum number of allowed requests
+ to the connected server. This command allows this size to be set to any
+ range between 0 (which means use the default server controlled size) bytes
+ and 16776960 (0xFFFF00) bytes. Using the server controlled size is the
+ most efficient as smbclient will pipeline as many simultaneous reads or
+ writes needed to keep the server as busy as possible. Setting this to
+ any other size will slow down the transfer. This can also be set
+ using the <command>iosize</command> command inside smbclient.
</para></listitem>
</varlistentry>
<varlistentry>
<term>-e|--encrypt</term>
- <listitem><para>This command line parameter requires the remote
- server support the UNIX extensions. Request that the connection be
- encrypted. This is new for Samba 3.2 and will only work with Samba
- 3.2 or above servers. Negotiates SMB encryption using GSSAPI. Uses
- the given credentials for the encryption negotiation (either kerberos
- or NTLMv1/v2 if given domain/username/password triple. Fails the
- connection if encryption cannot be negotiated.
+ <listitem><para>
+ This command line parameter requires the remote
+ server support the UNIX extensions or that the SMB3 protocol has been selected.
+ Requests that the connection be encrypted. Negotiates SMB encryption using either
+ SMB3 or POSIX extensions via GSSAPI. Uses the given credentials for
+ the encryption negotiation (either kerberos or NTLMv1/v2 if given
+ domain/username/password triple. Fails the connection if encryption
+ cannot be negotiated.
</para></listitem>
</varlistentry>
@@ -334,6 +350,18 @@
&popt.common.connection;
<varlistentry>
+ <term>-t|--timeout <timeout-seconds></term>
+ <listitem><para>This allows the user to tune the default
+ timeout used for each SMB request. The default setting is
+ 20 seconds. Increase it if requests to the server sometimes
+ time out. This can happen when SMB3 encryption is selected
+ and smbclient is overwhelming the server with requests.
+ This can also be set using the <command>timeout</command>
+ command inside smbclient.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>-T|--tar tar options</term>
<listitem><para>smbclient may be used to create <command>tar(1)
</command> compatible backups of all the files on an SMB/CIFS
@@ -694,12 +722,15 @@
<varlistentry>
<term>iosize <bytes></term>
- <listitem><para>When sending or receiving files, smbclient uses an
- internal memory buffer by default of size 64512 bytes. This command
- allows this size to be set to any range between 16384 (0x4000) bytes
- and 16776960 (0xFFFF00) bytes. Larger sizes may mean more efficient
- data transfer as smbclient will try and use the most efficient
- read and write calls for the connected server.
+ <listitem><para>
+ When sending or receiving files, smbclient uses an
+ internal buffer sized by the maximum number of allowed requests
+ to the connected server. This command allows this size to be set to any
+ range between 0 (which means use the default server controlled size) bytes
+ and 16776960 (0xFFFF00) bytes. Using the server controlled size is the
+ most efficient as smbclient will pipeline as many simultaneous reads or
+ writes needed to keep the server as busy as possible. Setting this to
+ any other size will slow down the transfer.
</para></listitem>
</varlistentry>
@@ -1041,6 +1072,16 @@
</varlistentry>
<varlistentry>
+ <term>timeout <per-operation timeout in seconds></term>
+ <listitem><para>This allows the user to tune the default
+ timeout used for each SMB request. The default setting is
+ 20 seconds. Increase it if requests to the server sometimes
+ time out. This can happen when SMB3 encryption is selected
+ and smbclient is overwhelming the server with requests.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>unlock <filenum> <hex-start> <hex-len></term>
<listitem><para>This command depends on the server supporting the CIFS
UNIX extensions and will fail if the server does not. Tries to unlock a POSIX
diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
index d729aa8..9c6042f 100644
--- a/docs-xml/wscript_build
+++ b/docs-xml/wscript_build
@@ -26,6 +26,7 @@ manpages='''
manpages/samba.7
manpages/samba.8
manpages/samba-tool.8
+ manpages/samba-regedit.8
manpages/sharesec.1
manpages/smbcacls.1
manpages/smbclient.1
diff --git a/libcli/smb/smb2_create_blob.h b/libcli/smb/smb2_create_blob.h
index 008befe..2f915b3 100644
--- a/libcli/smb/smb2_create_blob.h
+++ b/libcli/smb/smb2_create_blob.h
@@ -33,6 +33,18 @@ struct smb2_create_blobs {
struct smb2_create_blob *blobs;
};
+struct smb2_create_returns {
+ uint8_t oplock_level;
+ uint32_t create_action;
+ NTTIME creation_time;
+ NTTIME last_access_time;
+ NTTIME last_write_time;
+ NTTIME change_time;
+ uint64_t allocation_size;
+ uint64_t end_of_file;
+ uint32_t file_attributes;
+};
+
/*
parse a set of SMB2 create blobs
*/
diff --git a/libcli/smb/smb2cli_close.c b/libcli/smb/smb2cli_close.c
index ed15a20..5e31056 100644
--- a/libcli/smb/smb2cli_close.c
+++ b/libcli/smb/smb2cli_close.c
@@ -60,7 +60,8 @@ struct tevent_req *smb2cli_close_send(TALLOC_CTX *mem_ctx,
tcon,
session,
state->fixed, sizeof(state->fixed),
- NULL, 0);
+ NULL, 0, /* dyn* */
+ 0); /* max_dyn_len */
if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev);
}
diff --git a/libcli/smb/smb2cli_create.c b/libcli/smb/smb2cli_create.c
index 627bdcb..3f8d672 100644
--- a/libcli/smb/smb2cli_create.c
+++ b/libcli/smb/smb2cli_create.c
@@ -27,17 +27,9 @@
struct smb2cli_create_state {
uint8_t fixed[56];
- uint8_t oplock_level;
- uint32_t create_action;
- NTTIME creation_time;
- NTTIME last_access_time;
- NTTIME last_write_time;
- NTTIME change_time;
- uint64_t allocation_size;
- uint64_t end_of_file;
- uint32_t file_attributes;
uint64_t fid_persistent;
uint64_t fid_volatile;
+ struct smb2_create_returns cr;
struct smb2_create_blobs blobs;
};
@@ -70,6 +62,7 @@ struct tevent_req *smb2cli_create_send(
size_t blobs_offset;
uint8_t *dyn;
size_t dyn_len;
+ size_t max_dyn_len;
req = tevent_req_create(mem_ctx, &state,
struct smb2cli_create_state);
@@ -137,13 +130,23 @@ struct tevent_req *smb2cli_create_send(
data_blob_free(&blob);
}
+ /*
+ * We use max_dyn_len = 0
+ * as we don't explicitly ask for any output length.
+ *
+ * But it's still possible for the server to return
+ * large create blobs.
+ */
+ max_dyn_len = 0;
+
subreq = smb2cli_req_send(state, ev, conn, SMB2_OP_CREATE,
0, 0, /* flags */
timeout_msec,
tcon,
session,
state->fixed, sizeof(state->fixed),
- dyn, dyn_len);
+ dyn, dyn_len,
+ max_dyn_len);
if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev);
}
@@ -179,15 +182,15 @@ static void smb2cli_create_done(struct tevent_req *subreq)
body = (uint8_t *)iov[1].iov_base;
- state->oplock_level = CVAL(body, 2);
- state->create_action = IVAL(body, 4);
- state->creation_time = BVAL(body, 8);
- state->last_access_time = BVAL(body, 16);
- state->last_write_time = BVAL(body, 24);
- state->change_time = BVAL(body, 32);
- state->allocation_size = BVAL(body, 40);
- state->end_of_file = BVAL(body, 48);
- state->file_attributes = IVAL(body, 56);
+ state->cr.oplock_level = CVAL(body, 2);
+ state->cr.create_action = IVAL(body, 4);
+ state->cr.creation_time = BVAL(body, 8);
+ state->cr.last_access_time = BVAL(body, 16);
+ state->cr.last_write_time = BVAL(body, 24);
+ state->cr.change_time = BVAL(body, 32);
+ state->cr.allocation_size = BVAL(body, 40);
+ state->cr.end_of_file = BVAL(body, 48);
+ state->cr.file_attributes = IVAL(body, 56);
state->fid_persistent = BVAL(body, 64);
state->fid_volatile = BVAL(body, 72);
@@ -213,7 +216,8 @@ static void smb2cli_create_done(struct tevent_req *subreq)
NTSTATUS smb2cli_create_recv(struct tevent_req *req,
uint64_t *fid_persistent,
- uint64_t *fid_volatile)
+ uint64_t *fid_volatile,
+ struct smb2_create_returns *cr)
{
struct smb2cli_create_state *state =
tevent_req_data(req,
@@ -225,6 +229,9 @@ NTSTATUS smb2cli_create_recv(struct tevent_req *req,
}
*fid_persistent = state->fid_persistent;
*fid_volatile = state->fid_volatile;
+ if (cr) {
+ *cr = state->cr;
+ }
return NT_STATUS_OK;
}
@@ -242,7 +249,8 @@ NTSTATUS smb2cli_create(struct smbXcli_conn *conn,
uint32_t create_options,
struct smb2_create_blobs *blobs,
uint64_t *fid_persistent,
- uint64_t *fid_volatile)
+ uint64_t *fid_volatile,
+ struct smb2_create_returns *cr)
{
TALLOC_CTX *frame = talloc_stackframe();
struct tevent_context *ev;
@@ -273,7 +281,7 @@ NTSTATUS smb2cli_create(struct smbXcli_conn *conn,
if (!tevent_req_poll_ntstatus(req, ev, &status)) {
goto fail;
}
- status = smb2cli_create_recv(req, fid_persistent, fid_volatile);
+ status = smb2cli_create_recv(req, fid_persistent, fid_volatile, cr);
fail:
TALLOC_FREE(frame);
return status;
diff --git a/libcli/smb/smb2cli_echo.c b/libcli/smb/smb2cli_echo.c
index 29cbf26..39c592c 100644
--- a/libcli/smb/smb2cli_echo.c
+++ b/libcli/smb/smb2cli_echo.c
@@ -53,7 +53,8 @@ struct tevent_req *smb2cli_echo_send(TALLOC_CTX *mem_ctx,
NULL, /* tcon */
NULL, /* session */
state->fixed, sizeof(state->fixed),
- NULL, 0);
+ NULL, 0, /* dyn* */
+ 0); /* max_dyn_len */
if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev);
}
diff --git a/libcli/smb/smb2cli_flush.c b/libcli/smb/smb2cli_flush.c
index 0ca2699..f014720 100644
--- a/libcli/smb/smb2cli_flush.c
+++ b/libcli/smb/smb2cli_flush.c
@@ -58,7 +58,8 @@ struct tevent_req *smb2cli_flush_send(TALLOC_CTX *mem_ctx,
tcon,
session,
state->fixed, sizeof(state->fixed),
- NULL, 0);
+ NULL, 0, /* dyn* */
--
Samba Shared Repository
More information about the samba-cvs
mailing list