sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code
79,244 Commits 60 Branches 1,144 Tags 452 MiB
193078117d
Commit Graph

666 Commits

Author SHA1 Message Date
Stefan Metzmacher
524d06615f smb1cli_trans: return the status from the server if possible 
metze
 2011-11-29 16:00:08 +01:00
Stefan Metzmacher
f0d8038ed8 smbXcli: rebuild smb1.recv_iov array if we expect more than one response 
metze
 2011-11-29 16:00:07 +01:00
Stefan Metzmacher
8c7e7ee91b smbXcli: allow up to 10 iovec elements for the bytes in smb1cli_req_create() 
The smb1cli_trans_* code uses up to 6 elements, which was too much for
the current limit of 5.

metze
 2011-11-29 16:00:07 +01:00
Stefan Metzmacher
3453665bcb smbXcli: s/smb2cli_writev_done/smb2cli_req_writev_done 
This is a better name and it matches smb1cli_req_writev_done

metze
 2011-11-29 16:00:07 +01:00
Stefan Metzmacher
c9ca3bb492 smbXcli: call tevent_queue_stop() for the outgoing queue on disconnect 
metze
 2011-11-29 16:00:07 +01:00
Stefan Metzmacher
91cb09fa0c smbXcli: use talloc_stackframe() instead of talloc_tos() in smb1cli_conn_signv() 
metze
 2011-11-29 16:00:07 +01:00
Stefan Metzmacher
9f6454af39 libcli/smb: remove unused smb_signing_set_bsrspyl() prototype 
metze
 2011-11-29 16:00:07 +01:00
Volker Lendecke
7491bd78d6 Fix Coverity ID 2638: OVERRUN_STATIC 2011-11-28 14:52:32 +01:00
Volker Lendecke
f094cc3ade Fix Coverity ID 2639: UNUSED_VALUE 2011-11-28 14:52:31 +01:00
Volker Lendecke
d287fe5399 s3:libsmb: Fix a typo 2011-11-24 19:02:33 +01:00
Stefan Metzmacher
a210d9fa05 s3:smbXcli: keep two fd per connection in order to work with the epoll tevent backend 
metze
 2011-11-24 19:02:33 +01:00
Stefan Metzmacher
da2027faf7 smbXcli: rework smb1cli_trans.c to use smbXcli_conn/smbXcli_req 
metze
 2011-11-24 19:02:32 +01:00
Stefan Metzmacher
c1db4a0d9f smbXcli: cp source3/libsmb/clitrans.c libcli/smb/smb1cli_trans.c 
metze
 2011-11-24 19:02:32 +01:00
Stefan Metzmacher
bda3d491b4 smbXcli: add smb2cli_req_set_notify_async() 
That can be used if the caller wants to be notified if
the async interim response arrives.

metze
 2011-11-24 19:02:31 +01:00
Stefan Metzmacher
0995d68d59 smbXcli: add support for tevent_req_cancel() on smbXcli_req 
metze
 2011-11-24 19:02:31 +01:00
Stefan Metzmacher
91ffe696aa smbXcli: fix smb signing for SMBntcancel 
metze
 2011-11-24 19:02:31 +01:00
Stefan Metzmacher
c2a39f4ecd smbXcli: add smb2cli_session_create_channel() 
This makes it possible to implement SMB 2.22 Multi-Channel
for testing.

metze
 2011-11-24 19:02:31 +01:00
Stefan Metzmacher
99b3d57fc3 s3:smb2cli: make use of smbXcli_session and setup the session key for SMB2 signing 
metze
 2011-11-24 19:02:31 +01:00
Stefan Metzmacher
396d7a7dd3 smbXcli: add support for smb2 signing 
metze
 2011-11-24 19:02:31 +01:00
Stefan Metzmacher
3fd54b57c1 smbXcli: add smbXcli_session infrastructure 
metze
 2011-11-24 19:02:31 +01:00
Stefan Metzmacher
4435dad827 smbXcli: add support for PROTOCOL_SMB2_22 in smbXcli_negprot() 
metze
 2011-11-24 19:02:31 +01:00
Stefan Metzmacher
9d06e0fcc7 smbXcli: add support for SMB2 multi-credit requests 
metze
 2011-11-24 19:02:31 +01:00
Stefan Metzmacher
d533543166 smbXcli: add support for 2.??? negprot and PROTOCOL_SMB2_10 
metze
 2011-11-24 19:02:31 +01:00
Stefan Metzmacher
1cfeb3f8a0 smbXcli: pass client_guid to smbXcli_conn_create() 
metze
 2011-11-24 19:02:31 +01:00
Stefan Metzmacher
ceb063ca7d smbXcli: add smbXcli_negprot_* 
This supports negotiation of any SMB1 or SMB2 dialect.

metze
 2011-11-24 19:02:30 +01:00
Stefan Metzmacher
b958498c2a smbXcli: add helper functions to access the negotiated features 
metze
 2011-11-24 19:02:30 +01:00
Stefan Metzmacher
1a0ce02a23 smbXcli: also notify chained requests about broken connections 
metze
 2011-11-24 19:02:30 +01:00
Stefan Metzmacher
4d8e151779 smbXcli: simplify smb1cli_req_chain_submit() 
We should hang everything on the first request in the chain,
as that's the one that gets added to the pending array.

metze
 2011-11-24 19:02:30 +01:00
Stefan Metzmacher
e2912fa853 smbXcli: remove unused smb1cli_have_andx_command() 
metze
 2011-11-24 19:02:30 +01:00
Stefan Metzmacher
fee3a0a657 smbXcli: reorder smb1cli_conn_dispatch_incoming() to avoid too much nesting 
metze
 2011-11-24 19:02:30 +01:00
Stefan Metzmacher
0f194e35a6 smbXcli: rework smb1cli_req_recv() to expose an iov with 3 elements 
Each smb1cli_req has 3 iov elements
[SMB HDR, SMB Parameter Block, SMB Data Block].

The 'inbuf' is still exposed if the caller requires it
(until we fix all legacy callers).

The can now pass an array of expected [status,wct] combinations,
instead of just one expected min_wct.

metze
 2011-11-24 19:02:30 +01:00
Stefan Metzmacher
ce224f4d25 smbXcli: use smb1cli_inbuf_parse_chain() and remember more details per chain response 
metze
 2011-11-24 19:02:30 +01:00
Stefan Metzmacher
7c5651c3f6 smbXcli: add smb1cli_inbuf_parse_chain() 
metze
 2011-11-24 19:02:30 +01:00
Stefan Metzmacher
94cb738dd4 smbXcli: pass hdr to smb1cli_pull_raw_error() 
metze
 2011-11-24 19:02:30 +01:00
Stefan Metzmacher
4529395d3c smbXcli: add state->smb1.recv_{cmd,status,iov} 
In the following commits we will need to remember a few more things.

metze
 2011-11-24 19:02:30 +01:00
Stefan Metzmacher
5e7cf194d2 smbXcli: split out a smb1cli_req_flags() function 
metze
 2011-11-24 19:02:30 +01:00
Stefan Metzmacher
2a570e6305 smbXcli: set message id to UINT64_MAX for BREAK in smb2cli_req_create() 
This way the caller can register an oplock handler.

Note that smb2cli_req_compound_submit() will overwrite this
if a request is send over the wire.

metze
 2011-11-24 19:02:30 +01:00
Stefan Metzmacher
349977e1a0 s3:smb2cli: replace smb2cli_base.c code with the more generic smbXcli_base.c code 
metze
 2011-11-24 19:02:30 +01:00
Stefan Metzmacher
84806eceb2 smbXcli: rework smb2cli_req to smbXcli_conn/smbXcli_req 
metze
 2011-11-24 19:02:30 +01:00
Stefan Metzmacher
21b5f1c185 libcli/smb: copy smb2cli_req_* code to smbXcli_base.c 
metze
 2011-11-24 19:02:29 +01:00
Stefan Metzmacher
26892a9783 smbXcli: rework smbXcli_base.c to use smbXcli_conn/smbXcli_req 
This splits the low level smb code from 'struct cli_state'
and makes it much more generic and useful for testing.

metze
 2011-11-24 19:02:29 +01:00
Stefan Metzmacher
012dee3803 smbXcli: cp source3/libsmb/async_smb.c libcli/smb/smbXcli_base.c 
metze
 2011-11-24 19:02:29 +01:00
Christian Ambach
53ad886f75 security: add local authority well-known SIDs 
add the S-1-2 well-known SID family

Autobuild-User: Christian Ambach <ambi@samba.org>
Autobuild-Date: Thu Nov 24 19:01:08 CET 2011 on sn-devel-104
 2011-11-24 19:01:08 +01:00
Matthias Dieter Wallnöfer
4cafcf0e6b libcli/cldap/cldap.c - remove outdated comment 
Reviewed-by: metze

Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Thu Nov 10 20:32:08 CET 2011 on sn-devel-104
 2011-11-10 20:32:08 +01:00
Stefan Metzmacher
17f1a97a61 libcli/cldap: fix a crash bug in cldap_socket_recv_dgram() (bug #8593) 
After a calling any wrapper of tevent_req_notify_callback(),
e.g. tevent_req_nterror(), tevent_req_done(), tevent_req_nomem(),
a function has to return immediately otherwise it is very likely to
crash, unless in calls tevent_req_defer_callback() before.

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Thu Nov 10 16:31:59 CET 2011 on sn-devel-104
 2011-11-10 16:31:59 +01:00
Günther Deschner
6e67073900 waf: convert NDR_NBT into shared library. 
Guenther
 2011-11-03 18:35:09 +01:00
Günther Deschner
768b42f334 nbt: move netlogon_samlogon_response into librpc/ndr/ndr_nbt.h. 
Guenther
 2011-11-03 18:35:08 +01:00
Günther Deschner
0de2bf97ff nbt: move nbt_string ndr functions to ndr/ndr_nbt.c helper. 
Guenther
 2011-11-03 18:35:08 +01:00
Günther Deschner
72879f491f nbt: merge in LIBCLI_NDR_NETLOGON helper into NDR_NBT. 
Guenther
 2011-11-03 18:35:08 +01:00
Günther Deschner
2417ea4923 librpc: remove nbt dependency to svcctl. 
Guenther
 2011-11-03 18:35:08 +01:00
Günther Deschner
2ecd50116c librpc: remove nbt dependency to samr. 
Guenther
 2011-11-03 18:35:08 +01:00
Stefan Metzmacher
22344f3e03 libcli/smb: use the same values for SMB_SIGNING_* as the source3 code uses 
The source3 code currently uses:
 #define Undefined (-1)
 #define False false
 #define True true
 #define Required (3)

In order to make the rewrite easier we should match the values.

metze
 2011-11-03 16:55:12 +01:00
Stefan Metzmacher
812c3dc80a libcli/smb: remove unused SMB_SIGNING_SUPPORTED 
metze
 2011-11-03 16:55:12 +01:00
Stefan Metzmacher
a4ac06a4be libcli/smb: add SMB_SIGNING_IF_REQUIRED as replacement for SMB_SIGNING_SUPPORTED 
metze
 2011-11-03 16:55:12 +01:00
Stefan Metzmacher
feace943d5 libcli/smb: SMB_SIGNING_AUTO is no longer used 
metze
 2011-11-03 16:55:12 +01:00
Stefan Metzmacher
18205ac7ad libcli/smb: add SMB_SIGNING_DEFAULT 
metze
 2011-11-03 16:55:11 +01:00
Stefan Metzmacher
5f520e7717 libcli/smb: add smb_buffer_oob() helper 
A copy of trans_oob().

metze
 2011-10-26 15:33:30 +02:00
Stefan Metzmacher
0d9bd56afb libcli/smb: merge NEGOTIATE_SECURITY_* flags to smb_constants.h 
metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Wed Oct 26 11:27:12 CEST 2011 on sn-devel-104
 2011-10-26 11:27:12 +02:00
Stefan Metzmacher
1fa7300037 libcli/smb: move smb_signing.[ch] to the toplevel 
metze
 2011-10-25 01:47:21 +02:00
Stefan Metzmacher
d76758ab9f libcli/smb: remove unused includes from read_smb.h 
metze
 2011-10-25 00:24:07 +02:00
Stefan Metzmacher
f3c25bc6a5 libcli/smb: merge LOCKING_ANDX_* and OPLOCK_* defines to smb_constants.h 
metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Mon Oct 24 17:46:47 CEST 2011 on sn-devel-104
 2011-10-24 17:46:47 +02:00
Stefan Metzmacher
ec7cc700b2 libcli/smb: move more defines to smb_constants.h 
metze
 2011-10-24 16:10:36 +02:00
Stefan Metzmacher
6fef69562b libcli/smb: move CAP_* defines to smb_constants.h 
metze
 2011-10-24 16:10:36 +02:00
Andrew Bartlett
59e838a1c4 libcli/smb Move smb_seal.h include to files that use it. 
This is required because at the moment, smb_seal.h includes references to gssapi structures
and this causes issues with header dependencies on subsystems that otherwise do not need
a gssapi dependency.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
 2011-10-24 13:56:52 +02:00
Stefan Metzmacher
7ebd4337ac libcli/smb: move source3/libsmb/read_smb.* to the toplevel 
metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Mon Oct 24 10:18:06 CEST 2011 on sn-devel-104
 2011-10-24 10:18:06 +02:00
Matthieu Patou
4d2d33ee09 libcli-cldap: avoid the case local == remote == NULL 2011-10-21 22:29:09 +02:00
Stefan Metzmacher
66530e9149 libcli/cldap: make sure the local and remote address family matches 
metze

Signed-off-by: Matthieu Patou <mat@matws.net>
 2011-10-21 22:29:09 +02:00
Günther Deschner
80741d98d8 libcli: remove unneeded com_err.h and fix the build here. 
Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Fri Oct 21 15:52:36 CEST 2011 on sn-devel-104
 2011-10-21 15:52:36 +02:00
Stefan Metzmacher
75d146d3ed libcli/smb: move smb_seal.c to the toplevel 
metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Fri Oct 21 10:22:39 CEST 2011 on sn-devel-104
 2011-10-21 10:22:39 +02:00
Stefan Metzmacher
e03b312b12 libcli/smb: add smb_setlen_[nbt|tcp] macros 
metze
 2011-10-21 08:42:59 +02:00
Stefan Metzmacher
32938ce60d libcli/smb: move some common defines to smb_constants.h 
metze
 2011-10-21 08:42:59 +02:00
Amitay Isaacs
51855de633 werror: Added missing DNS error codes 
Signed-off-by: Andrew Tridgell <tridge@samba.org>
 2011-10-20 05:53:05 +02:00
Stefan Metzmacher
cd22763440 libcli/smb: add smb_[set]len_[nbt|tcp]() macros 
metze
 2011-10-19 15:44:29 +02:00
David Disseldorp
b711de287f libcli: Move smb2 fsctl fn defs into common code 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
 2011-10-19 15:44:29 +02:00
David Disseldorp
d5ea379428 s3: Remove duplicate fsctl function definitions 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
 2011-10-19 15:44:29 +02:00
David Disseldorp
281fc93c6b libcli: move ioctl function field defs to smb_constants 
Currently there are a lot of duplicate ioctl function field definitions
between source3 and source4.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
 2011-10-19 15:44:29 +02:00
Andrew Bartlett
0c6e4adcb2 ntlmssp: Move ntlmssp code to auth/ntlmssp 
This brings in the code from both libcli/auth and
source4/auth/ntlmssp.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
 2011-10-18 13:13:31 +11:00
Andrew Bartlett
01c934c81e lib/util: Add back control of mmap and hash size in tdb for top level build 
This passes down a struct loadparm_context to allow these
parameters to be checked.  This may be s3 or s4 context, allowing the
#if _SAMBA_BUILD_ macro to go away safely.

Andrew Bartlett
 2011-10-13 14:06:07 +02:00
Andrew Bartlett
5603dab647 libcli/auth: Provide a struct loadparm_context to schannel calls 
This will allow us to pass this down to the tdb_wrap layer.

Andrew Bartlett
 2011-10-13 14:06:07 +02:00
Andrew Bartlett
26de383c42 libcli/smb Move CSC_POLICY_* definition to smb_constants.h 
This removes the duplicate definition between smb.h and lib/param/loadparm.c
which in turn allows this file to be compiled with the s3 includes.h

Andrew Bartlett
 2011-10-11 13:41:34 +11:00
Andrew Bartlett
b21b012756 lib/param move source4 param code to the top level 
This is done so that the lpcfg_ functions are available across the whole
build, either with the struct loadparm_context loaded from an smb.conf directly
or as a wrapper around the source3 param code.

This is not the final, merged loadparm, but simply one step to make
it easier to solve other problems while we make our slow progress
on this difficult problem.

Andrew Bartlett
 2011-10-11 13:41:34 +11:00
Stefan Metzmacher
b787b6e1bd libcli/cldap: don't pass tevent_context to cldap_socket_init() 
metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Mon Oct 10 23:23:07 CEST 2011 on sn-devel-104
 2011-10-10 23:23:07 +02:00
Stefan Metzmacher
af24591a20 libcli/cldap: make use of explicit tevent_contexts 
metze
 2011-10-10 21:50:26 +02:00
Stefan Metzmacher
5a7a1b35be libcli/cldap: pass tevent_context to cldap_search_send() 
metze
 2011-10-10 21:50:26 +02:00
Stefan Metzmacher
2cd76b0931 libcli/cldap: pass tevent_context to cldap_netlogon_send() 
metze
 2011-10-10 21:50:26 +02:00
Stefan Metzmacher
3ed85d7c69 libcli/cldap: pass tevent_context to cldap_set_incoming_handler() 
metze
 2011-10-10 21:50:26 +02:00
Andrew Bartlett
36b2227eca ldb: use ldb directly rather than via a copy 
This avoids needing to manually sync the two files, which due to the
top level build must be API compatible at all times anyway.

The most important recent change was:

commit e3b76bd620
Author: Andrew Tridgell <tridge@samba.org>
Date:   Thu Jul 28 15:51:31 2011 +1000

    ldb: fixed a search expression parse bug

However, as we always control the search expression in the callers to
this code, no backport to other releases is required.

Andrew Bartlett
 2011-10-07 17:45:20 +11:00
Andrew Bartlett
055f017b36 build: Reduce build systems to just top level waf and autoconf 
The s3-waf build system is a key component of the top level build, but
with this commit is is no longer available directly.  This reduces the
number of build system combinations in master as we prepare for the
Samba 4.0 release.

Andrew Bartlett
 2011-10-07 17:42:03 +11:00
Jelmer Vernooij
3358239a57 smb_unix_ext.h: Protect against multiple inclusion. 2011-09-28 12:05:54 +02:00
Jelmer Vernooij
2660a465c3 Install headers included by smb_common.h. 2011-09-28 11:32:36 +02:00
Kai Blin
df88e66250 errormap: Add unix_to_werror() function 
While this function technically is closest to the
map_nt_status_from_unix() function, I think it is better to keep the new
function in line with our usual fooerror_to_barerror() naming scheme.

Signed-off-by: Kai Blin <kai@samba.org>
 2011-09-28 02:02:35 +02:00
Kai Blin
8eb80a9d83 libcli/smb: Get rid of set but unused variable 2011-09-24 21:46:05 -07:00
Jeremy Allison
e99a18cdc0 Remove extraneous debug code. 
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Thu Sep 22 00:22:12 CEST 2011 on sn-devel-104
 2011-09-22 00:22:12 +02:00
Jeremy Allison
d89bbe9b0a Fix bug #8474 - SMB2 create doesn't cope with an Apple client using NULL blob in create 
Cope with zero length data_offset and data_length values.

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Wed Sep 21 22:12:40 CEST 2011 on sn-devel-104
 2011-09-21 22:12:40 +02:00
Stefan Metzmacher
62d4a317f9 libcli/smb: add SMB2_DIALECT_REVISION_222 
metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Fri Sep 16 19:51:47 CEST 2011 on sn-devel-104
 2011-09-16 19:51:47 +02:00
Stefan Metzmacher
f6217aa7d1 libcli/smb: add PROTOCOL_SMB2_22 
metze
 2011-09-16 16:44:14 +02:00
Stefan Metzmacher
d727fcc867 libcli/auth: add some const to SMBNTencrypt_hash() and SMBNTencrypt() 
metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Wed Sep 14 19:49:24 CEST 2011 on sn-devel-104
 2011-09-14 19:49:24 +02:00
Stefan Metzmacher
258ffddf1c libcli/smb: s/FLAGS2_UNKNOWN_BIT4/FLAGS2_SMB_SECURITY_SIGNATURES_REQUIRED 
metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Sat Sep 10 00:34:50 CEST 2011 on sn-devel-104
 2011-09-10 00:34:50 +02:00
Stefan Metzmacher
dd3c1b740c smb2_constants: add SMB2_WRITEFLAG_WRITE_THROUGH define 
metze
 2011-09-06 15:28:00 +02:00
Stefan Metzmacher
d7eb4a4c85 libcli/smb: add PROTOCOL_SMB2_10 
metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Mon Sep  5 14:57:06 CEST 2011 on sn-devel-104
 2011-09-05 14:57:06 +02:00