first pass at updating head branch to be to be the same as the SAMBA_2_0 branch

[kai/samba.git] / source3 / include / client.h

diff --git a/source3/include/client.h b/source3/include/client.h
index 275f3b44da1d81a61d0737412f710abdec1b82b1..15ba66e3e12416412529f762536254fd7e3955dc 100644 (file)
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -27,7 +27,7 @@
 /* the client asks for a smaller buffer to save ram and also to get more
    overlap on the wire. This size gives us a nice read/write size, which
    will be a multiple of the page size on almost any system */
-#define CLI_BUFFER_SIZE (0x4400)
+#define CLI_BUFFER_SIZE (0xFFFF)
 
 /*
  * These definitions depend on smb.h
@@ -56,8 +56,22 @@ struct print_job_info
        time_t t;
 };
 
-struct cli_state
+struct pwd_info
 {
+    BOOL null_pwd;
+    BOOL cleartext;
+    BOOL crypted;
+
+    fstring password;
+
+    uchar smb_lm_pwd[16];
+    uchar smb_nt_pwd[16];
+
+    uchar smb_lm_owf[24];
+    uchar smb_nt_owf[24];
+};
+
+struct cli_state {
        int port;
        int fd;
        uint16 cnum;
@@ -69,11 +83,10 @@ struct cli_state
        int rap_error;
        int privileges;
 
-       struct ntuser_creds usr;
-       BOOL retry;
-
        fstring eff_name;
        fstring desthost;
+       fstring user_name;
+       fstring domain;
 
        /*
         * The following strings are the
@@ -88,23 +101,17 @@ struct cli_state
        fstring dev;
        struct nmb_name called;
        struct nmb_name calling;
+       fstring full_dest_host_name;
        struct in_addr dest_ip;
 
+       struct pwd_info pwd;
        unsigned char cryptkey[8];
-       unsigned char lm_cli_chal[8];
-       unsigned char nt_cli_chal[128];
-       size_t nt_cli_chal_len;
-
-       BOOL use_ntlmv2;
-       BOOL redirect;
-       BOOL reuse;
-
        uint32 sesskey;
        int serverzone;
        uint32 servertime;
        int readbraw_supported;
        int writebraw_supported;
-       int timeout;
+       int timeout; /* in milliseconds. */
        int max_xmit;
        int max_mux;
        char *outbuf;
@@ -119,16 +126,20 @@ struct cli_state
         */
 
        uint32 nt_error;                   /* NT RPC error code. */
+       uint16 nt_pipe_fnum;               /* Pipe handle. */
        unsigned char sess_key[16];        /* Current session key. */
        unsigned char ntlmssp_hash[258];   /* ntlmssp data. */
        uint32 ntlmssp_cli_flgs;           /* ntlmssp client flags */
        uint32 ntlmssp_srv_flgs;           /* ntlmssp server flags */
        uint32 ntlmssp_seq_num;            /* ntlmssp sequence number */
        DOM_CRED clnt_cred;                /* Client credential. */
+       fstring mach_acct;                 /* MYNAME$. */
+       fstring srv_name_slash;            /* \\remote server. */
+       fstring clnt_name_slash;           /* \\local client. */
        uint16 max_xmit_frag;
        uint16 max_recv_frag;
-};
 
-struct cli_connection;
+       BOOL use_oplocks; /* should we use oplocks? */
+};
 
 #endif /* _CLIENT_H */