1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Commit Graph

233 Commits

Author SHA1 Message Date
Stefan Metzmacher
5c7523890d s3:libsmb: use a local got_kerberos_mechanism variable in cli_session_creds_prepare_krb5()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
2017-01-27 08:09:15 +01:00
Jeremy Allison
b4f9ac6a24 s3: libsmb: Widen the internal client smb1.pid to 32-bits as is used on the wire and in libcli/smb/smb1*.c
Note: This has *NO* effect on the lock context code, as on the
wire for all SMB1 locking requests, the pid used as the lock
context is already truncated down to 16-bits - the field is only
16-bits wide.

This allows the cli_XXX() calls to correctly set pidlow AND pidhigh
in SMB1 requests put on the wire by the libcli/smb/smb1*.c code.

Note that currently the smbd server doesn't correctly return
pidhigh yet - a fix (and tests) for that will follow.

As pidhigh is not checked in any client code (mid is used
to differentiate different requests) this has no effect
other than a correctness fix.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
2016-06-18 15:32:17 +02:00
Richard Sharpe
589c7bc6d6 Convert all uint32/16/8 to _t in source3/client.
Signed-off-by: Richard Sharpe <rsharpe@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
2015-05-13 19:11:23 +02:00
Stefan Metzmacher
bbad2fed7c s3:libsmb: remove unused cli_set_username() function
Change-Id: Ib432b4ff66f966de9e733e01de6de2f486c0c728
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2014-10-17 12:57:07 +02:00
Stefan Metzmacher
71432b9eda s3:libsmb: Remove unused domain copy stored in cli_state
Change-Id: I7333140906bb3a487205b5760396dcc00a9f49b0
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
2014-10-17 12:57:07 +02:00
Andrew Bartlett
2b9d6d3d9b s3:libsmb: Remove unused password copy stored in cli_state
Change-Id: Ia6b33a25628ae08be8a8c6baeb71ce390315cb45
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
2014-10-17 12:57:07 +02:00
Stefan Metzmacher
7f3faa1f18 s3:include: let CLI_BUFFER_SIZE be an alias of SMB_BUFFER_SIZE_MAX
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10422
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
2014-03-05 10:06:24 -08:00
Stefan Metzmacher
307abd61df s3:libsmb: remove unused cli_state->case_sensitive
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10200

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2013-10-17 16:24:52 +02:00
Stefan Metzmacher
e20c66d780 s3:libsmb: remove unused cli_state->dfsroot
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10200

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2013-10-17 16:23:33 +02:00
Jeremy Allison
28591dfd5d 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>
2013-08-15 09:07:06 +02:00
Stefan Metzmacher
11e0be0e72 s3:libsmb: remove unused cli_state->is_guestlogin
Signed-off-by: Stefan Metzmacher <metze@samba.org>

Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2013-08-10 09:18:52 +02:00
Scott Lovenberg
bd18d996e2 Clean up client timeout definitions [rev. 2]
The definitions for default client timeout values have been moved to client.h.  When initializing a client struct we use this value instead of the old hardcoded value.  The timeout value remains 20 seconds.

Signed-off-by: Scott Lovenberg <scott.lovenberg@gmail.com>
Reviewed by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Dec  6 03:25:58 CET 2012 on sn-devel-104
2012-12-06 03:25:58 +01:00
Stefan Metzmacher
0ec50e8a2f s3:libsmb: remove unused cli_state->user_session_key
metze
2012-08-01 14:17:15 +02:00
Stefan Metzmacher
bb6761c127 s3:libsmb: remove unused cli_state->smb2.pid
metze
2012-07-25 12:15:05 +02:00
Stefan Metzmacher
167d94c73d s3:libsmb: remove unused tcon specific elements from cli_state->smb2
metze
2012-07-25 12:15:03 +02:00
Stefan Metzmacher
d2ba9c36f3 s3:libsmb: remove cli_state->smb2.tid
metze
2012-07-25 12:15:03 +02:00
Stefan Metzmacher
92efe1a35f s3:libsmb: setup a smbXcli_tcon for SMB2
metze
2012-07-24 22:20:06 +02:00
Stefan Metzmacher
ed726281b3 s3:libsmb: use a smbXcli_tcon instead of uint16_t cli_state->smb1.tid
metze
2012-07-24 18:44:04 +02:00
Luk Claes
cdec0c4646 s3:libsmb: use cli_state_{g,s}et_uid instead of smb1.uid directly
Signed-off-by: Luk Claes <luk@debian.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-07-23 22:13:29 +02:00
Volker Lendecke
93e950caf8 s3: Add cli_state->pw_nt_hash
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-12 10:48:15 +02:00
Volker Lendecke
4fb283e70e s3: Add CLI_FULL_CONNECTION_USE_NT_HASH
... as an indicator that the password supplied is the NT hash

Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-12 10:48:15 +02:00
Jeremy Allison
af76d2588c After a discussion with Volker, sdd a backup_intent state to the client struct.
This causes the backup_intent flags to be added to findfirst/findnext
and ntcreate/nttrans_create calls.

cli_set_backup_intent() sets the flag and returns the old value of
its state.
2011-12-01 13:24:22 -08:00
Stefan Metzmacher
9ebdee2817 s3:libsmb: implement cli_state based functions on top of smbXcli_conn/smbXcli_req
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
7e7bca4188 s3:smb2cli: implement smb2cli_negprot() on top of smbXcli_negprot()
metze
2011-11-24 19:02:31 +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
Björn Baumbach
e4934a1e42 s3-libsmb: introduce option to disable dos error mapping
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2011-11-16 19:02:12 +01:00
Stefan Metzmacher
e99017af72 s3:libsmb: also remember the optional server name from the negprot response
W2K (at least sp4) and higher also send the server name.

metze
2011-11-04 14:16:29 +01:00
Stefan Metzmacher
ef8dc2d30e s3:libsmb: move cli->server{zone,time} to cli->conn.smb1.server.{time_zone,system_time}
metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Thu Sep 15 14:00:29 CEST 2011 on sn-devel-104
2011-09-15 14:00:26 +02:00
Stefan Metzmacher
aca5e33b00 s3:libsmb: split cli->secblob into cli->conn.smb1.server.{guid,gss_blob,challenge,workgroup}
metze
2011-09-15 12:12:28 +02:00
Stefan Metzmacher
dcf54977d7 s3:libsmb: move cli->sesskey to cli->conn.smb1.server.session_key
metze
2011-09-15 12:12:25 +02:00
Stefan Metzmacher
abca5f17c3 s3:libsmb: detect lock_read and write_unlock support
metze
2011-09-15 12:12:25 +02:00
Stefan Metzmacher
14e8ef14a0 s3:libsmb: move cli->*braw_supported to cli->conn.smb1.server.*braw
This is currently unused, but we might use it in future.

metze
2011-09-15 12:12:25 +02:00
Stefan Metzmacher
596aa96d17 s3:libsmb: move cli->sec_mode to cli->conn.smb1.server.security_mode
metze
2011-09-15 12:12:24 +02:00
Stefan Metzmacher
8f44105cc4 s3:libsmb: move cli->max_mux to cli->conn.smb1.server.max_mux
metze
2011-09-15 12:12:24 +02:00
Stefan Metzmacher
768581eee5 s3:libsmb: move cli->max_xmit to cli->conn.smb1.max_xmit
And keep cli->conn.smb1.client.max_xmit and
cli->conn.smb1.server.max_xmit.

metze
2011-09-15 12:12:24 +02:00
Stefan Metzmacher
b02d27ae05 s3:libsmb: move cli->smb1.mid to cli->conn.smb1.mid
metze
2011-09-15 12:12:23 +02:00
Stefan Metzmacher
595f0020d4 s3:libsmb: move cli->capabilities to cli->conn.smb1.capabilities
And keep cli->conn.smb1.client.capabilities and
cli->conn.smb1.server_capabilities.

metze
2011-09-15 12:12:23 +02:00
Stefan Metzmacher
74a581afe5 s3:libsmb: move cli->protocol to cli->conn.protocol
metze
2011-09-15 12:12:22 +02:00
Stefan Metzmacher
7f40b606c4 s3:libsmb: use local variables in cli_state_create()
We don't need to keep use_spnego, use_level_II_oplocks, force_dos_errors
and force_ascii within struct cli_state.

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Thu Sep 15 10:12:17 CEST 2011 on sn-devel-104
2011-09-15 10:12:17 +02:00
Stefan Metzmacher
ff52be06e5 s3:libsmb: remove unused cli->is_samba
s3:libsmb: remove unused cli->is_samba

metze

Signed-off-by: Jeremy Allison <jra@samba.org>
2011-09-14 13:12:52 -07:00
Stefan Metzmacher
73cc454af0 s3:client.h: remove unused defines
s3:client.h: remove unused defines

metze

Signed-off-by: Jeremy Allison <jra@samba.org>
2011-09-14 13:10:45 -07:00
Stefan Metzmacher
a26fe036fe s3:smb2cli: split cli->smb2.gss_blob from cli->secblob
metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Tue Sep 13 23:34:13 CEST 2011 on sn-devel-104
2011-09-13 23:34:13 +02:00
Stefan Metzmacher
80d2c2b00d s3:libsmb: don't mix smb2 share capabilities with smb1 capabilities
metze
2011-09-13 18:12:22 +02:00
Stefan Metzmacher
b7a1fd95a6 s3:libsmb: the smb2 server capabilities from the session setup are 32-bit
metze
2011-09-13 18:12:22 +02:00
Stefan Metzmacher
a7e418dd45 s3:libsmb: add CLI_FULL_CONNECTION_FORCE_ASCII
metze
2011-09-08 17:51:30 +02:00
Stefan Metzmacher
db79aa7260 s3:libsmb: add CLI_FULL_CONNECTION_FORCE_DOS_ERRORS
metze
2011-09-08 17:51:29 +02:00
Stefan Metzmacher
c485df9530 s3:libsmb: abstract the incoming dispatch function via a function pointer
This will allow handling of SMB2 in future.

metze
2011-08-12 18:06:04 +02:00
Stefan Metzmacher
c6a3dedd99 s3:libsmb: store the remote_realm on the cli_state
metze
2011-08-10 11:14:55 +02:00
Stefan Metzmacher
c399ad4cdd s3:include: change cli->protocol to enum protocol_types
metze
2011-08-02 04:54:28 +02:00