[GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch.

[samba.git] / source / include / client.h

diff --git a/source/include/client.h b/source/include/client.h
index 0f268834c68df0389cd0a93ca0659cd6b055257f..5165b85df11e2af0f7223d8d80d6242165b71ff0 100644 (file)
--- a/source/include/client.h
+++ b/source/include/client.h
@@ -7,7 +7,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _CLIENT_H
@@ -29,6 +28,7 @@
 #define CLI_BUFFER_SIZE (0xFFFF)
 #define CLI_SAMBA_MAX_LARGE_READX_SIZE (127*1024) /* Works for Samba servers */
 #define CLI_WINDOWS_MAX_LARGE_READX_SIZE ((64*1024)-2) /* Windows servers are broken.... */
+#define CLI_SAMBA_MAX_POSIX_LARGE_READX_SIZE (0xFFFF00) /* 24-bit len. */
 
 /*
  * These definitions depend on smb.h
@@ -78,20 +78,6 @@ struct rpc_pipe_client {
        struct dcinfo *dc;
 };
 
-/* Transport encryption state. */
-enum smb_trans_enc_type { SMB_TRANS_ENC_NTLM, SMB_TRANS_ENC_KRB5 };
-
-struct smb_trans_enc_state {
-       enum smb_trans_enc_type smb_enc_type;
-       BOOL enc_on;
-       union {
-               NTLMSSP_STATE *ntlmssp_state;
-#if defined(HAVE_GSSAPI_SUPPORT) && defined(HAVE_KRB5)
-               gss_ctx_id_t context_handle;
-#endif
-       };
-};
-
 struct cli_state {
        int port;
        int fd;
@@ -144,14 +130,13 @@ struct cli_state {
        int win95;
        BOOL is_samba;
        uint32 capabilities;
+       uint32 posix_capabilities;
        BOOL dfsroot;
 
        TALLOC_CTX *mem_ctx;
 
        smb_sign_info sign_info;
 
-       struct smb_trans_enc_state *trans_enc_state; /* Setup if we're encrypting SMB's. */
-
        /* the session key for this CLI, outside 
           any per-pipe authenticaion */
        DATA_BLOB user_session_key;