s3: Add ccache use to cli_session_setup_ntlmssp

[nivanova/samba-autobuild/.git] / source3 / include / client.h

diff --git a/source3/include/client.h b/source3/include/client.h
index 73a1d7b554879eafba85da85479307313d3512f2..c74c74509aa77ba236a8401bfdef4012a2f7631f 100644 (file)
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -48,15 +48,15 @@ struct print_job_info {
 
 struct cli_pipe_auth_data {
        enum pipe_auth_type auth_type; /* switch for the union below. Defined in ntdomain.h */
-       enum pipe_auth_level auth_level; /* defined in ntdomain.h */
+       enum dcerpc_AuthLevel auth_level; /* defined in ntdomain.h */
 
        char *domain;
        char *user_name;
        DATA_BLOB user_session_key;
 
        union {
-               struct schannel_auth_struct *schannel_auth;
-               NTLMSSP_STATE *ntlmssp_state;
+               struct schannel_state *schannel_auth;
+               struct ntlmssp_state *ntlmssp_state;
                struct kerberos_auth_struct *kerberos_auth;
        } a_u;
 };
@@ -68,6 +68,8 @@ struct cli_pipe_auth_data {
 
 struct rpc_cli_transport {
 
+       enum dcerpc_transport_t transport;
+
        /**
         * Trigger an async read from the server. May return a short read.
         */
@@ -124,6 +126,17 @@ struct rpc_pipe_client {
                        const struct ndr_interface_table *table,
                        uint32_t opnum, void *r);
 
+       struct tevent_req *(*dispatch_send)(
+               TALLOC_CTX *mem_ctx,
+               struct tevent_context *ev,
+               struct rpc_pipe_client *cli,
+               const struct ndr_interface_table *table,
+               uint32_t opnum,
+               void *r);
+       NTSTATUS (*dispatch_recv)(struct tevent_req *req,
+                                 TALLOC_CTX *mem_ctx);
+
+
        char *desthost;
        char *srv_name_slash;
 
@@ -132,8 +145,8 @@ struct rpc_pipe_client {
 
        struct cli_pipe_auth_data *auth;
 
-       /* The following is only non-null on a netlogon pipe. */
-       struct dcinfo *dc;
+       /* The following is only non-null on a netlogon client pipe. */
+       struct netlogon_creds_CredentialState *dc;
 
        /* Used by internal rpc_pipe_client */
        pipes_struct *pipes_struct;
@@ -159,7 +172,7 @@ struct smb_trans_enc_state {
         uint16 enc_ctx_num;
         bool enc_on;
         union {
-                NTLMSSP_STATE *ntlmssp_state;
+                struct ntlmssp_state *ntlmssp_state;
 #if defined(HAVE_GSSAPI) && defined(HAVE_KRB5)
                 struct smb_tran_enc_state_gss *gss_state;
 #endif
@@ -253,44 +266,23 @@ struct cli_state {
        bool use_kerberos;
        bool fallback_after_kerberos;
        bool use_spnego;
+       bool use_ccache;
        bool got_kerberos_mechanism; /* Server supports krb5 in SPNEGO. */
 
        bool use_oplocks; /* should we use oplocks? */
        bool use_level_II_oplocks; /* should we use level II oplocks? */
 
        /* a oplock break request handler */
-       bool (*oplock_handler)(struct cli_state *cli, int fnum, unsigned char level);
+       NTSTATUS (*oplock_handler)(struct cli_state *cli, uint16_t fnum, unsigned char level);
 
        bool force_dos_errors;
        bool case_sensitive; /* False by default. */
 
-       /**
-        * fd_event is around while we have async requests outstanding or are
-        * building a chained request.
-        *
-        * (fd_event!=NULL) &&
-        *  ((outstanding_request!=NULL)||(chain_accumulator!=NULL))
-        *
-        * should always be true, as well as the reverse: If both cli_request
-        * pointers are NULL, no fd_event is around.
-        */
-       struct fd_event *fd_event;
-       char *evt_inbuf;
-
-       /**
-        * A linked list of requests that are waiting for a reply
-        */
-       struct cli_request *outstanding_requests;
-
-       /**
-        * The place to build up the list of chained requests. In CIFS, a
-        * single cli_request corresponds to a MID and can serve more than one
-        * chained async_req.
-        */
-       struct cli_request *chain_accumulator;
-
        /* Where (if anywhere) this is mounted under DFS. */
        char *dfs_mountpoint;
+
+       struct tevent_queue *outgoing;
+       struct tevent_req **pending;
 };
 
 typedef struct file_info {
@@ -311,5 +303,7 @@ typedef struct file_info {
 #define CLI_FULL_CONNECTION_USE_KERBEROS 0x0002
 #define CLI_FULL_CONNECTION_ANONYMOUS_FALLBACK 0x0004
 #define CLI_FULL_CONNECTION_FALLBACK_AFTER_KERBEROS 0x0008
+#define CLI_FULL_CONNECTION_OPLOCKS 0x0010
+#define CLI_FULL_CONNECTION_LEVEL_II_OPLOCKS 0x0020
 
 #endif /* _CLIENT_H */