Convert all uint32/16/8 to _t in source3/libsmb.
[bbaumbach/samba-autobuild/.git] / source3 / libsmb / clifsinfo.c
index fb923378ab46e18e3fa237e0412cf38beba6b668..3fbfbbe67a617d508c2a7150f2d15efa986c5dd7 100644 (file)
    FS info functions
    Copyright (C) Stefan (metze) Metzmacher     2003
    Copyright (C) Jeremy Allison 2007
-   
+   Copyright (C) Andrew Bartlett 2011
+
    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 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    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, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "libsmb/libsmb.h"
+#include "../libcli/auth/spnego.h"
+#include "../auth/ntlmssp/ntlmssp.h"
+#include "../lib/util/tevent_ntstatus.h"
+#include "async_smb.h"
+#include "../libcli/smb/smb_seal.h"
+#include "trans2.h"
+#include "auth_generic.h"
+#include "auth/gensec/gensec.h"
+#include "../libcli/smb/smbXcli_base.h"
+#include "auth/credentials/credentials.h"
 
 /****************************************************************************
  Get UNIX extensions version info.
 ****************************************************************************/
 
-bool cli_unix_extensions_version(struct cli_state *cli, uint16 *pmajor, uint16 *pminor,
-                                        uint32 *pcaplow, uint32 *pcaphigh)
-{
-       bool ret = False;
-       uint16 setup;
-       char param[2];
-       char *rparam=NULL, *rdata=NULL;
-       unsigned int rparam_count=0, rdata_count=0;
+struct cli_unix_extensions_version_state {
+       struct cli_state *cli;
+       uint16_t setup[1];
+       uint8_t param[2];
+       uint16_t major, minor;
+       uint32_t caplow, caphigh;
+};
 
-       setup = TRANSACT2_QFSINFO;
+static void cli_unix_extensions_version_done(struct tevent_req *subreq);
 
-       SSVAL(param,0,SMB_QUERY_CIFS_UNIX_INFO);
+struct tevent_req *cli_unix_extensions_version_send(TALLOC_CTX *mem_ctx,
+                                                   struct tevent_context *ev,
+                                                   struct cli_state *cli)
+{
+       struct tevent_req *req, *subreq;
+       struct cli_unix_extensions_version_state *state;
 
-       if (!cli_send_trans(cli, SMBtrans2,
-                   NULL,
-                   0, 0,
-                   &setup, 1, 0,
-                   param, 2, 0,
-                   NULL, 0, 560)) {
-               goto cleanup;
+       req = tevent_req_create(mem_ctx, &state,
+                               struct cli_unix_extensions_version_state);
+       if (req == NULL) {
+               return NULL;
        }
+       state->cli = cli;
+       SSVAL(state->setup, 0, TRANSACT2_QFSINFO);
+       SSVAL(state->param, 0, SMB_QUERY_CIFS_UNIX_INFO);
 
-       if (!cli_receive_trans(cli, SMBtrans2,
-                              &rparam, &rparam_count,
-                              &rdata, &rdata_count)) {
-               goto cleanup;
+       subreq = cli_trans_send(state, ev, cli, SMBtrans2,
+                               NULL, 0, 0, 0,
+                               state->setup, 1, 0,
+                               state->param, 2, 0,
+                               NULL, 0, 560);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
        }
+       tevent_req_set_callback(subreq, cli_unix_extensions_version_done, req);
+       return req;
+}
 
-       if (cli_is_error(cli)) {
-               ret = False;
-               goto cleanup;
-       } else {
-               ret = True;
+static void cli_unix_extensions_version_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct cli_unix_extensions_version_state *state = tevent_req_data(
+               req, struct cli_unix_extensions_version_state);
+       uint8_t *data;
+       uint32_t num_data;
+       NTSTATUS status;
+
+       status = cli_trans_recv(subreq, state, NULL, NULL, 0, NULL,
+                               NULL, 0, NULL, &data, 12, &num_data);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               tevent_req_nterror(req, status);
+               return;
        }
 
-       if (rdata_count < 12) {
-               goto cleanup;
+       state->major = SVAL(data, 0);
+       state->minor = SVAL(data, 2);
+       state->caplow = IVAL(data, 4);
+       state->caphigh = IVAL(data, 8);
+       TALLOC_FREE(data);
+       tevent_req_done(req);
+}
+
+NTSTATUS cli_unix_extensions_version_recv(struct tevent_req *req,
+                                         uint16_t *pmajor, uint16_t *pminor,
+                                         uint32_t *pcaplow,
+                                         uint32_t *pcaphigh)
+{
+       struct cli_unix_extensions_version_state *state = tevent_req_data(
+               req, struct cli_unix_extensions_version_state);
+       NTSTATUS status;
+
+       if (tevent_req_is_nterror(req, &status)) {
+               return status;
+       }
+       *pmajor = state->major;
+       *pminor = state->minor;
+       *pcaplow = state->caplow;
+       *pcaphigh = state->caphigh;
+       state->cli->server_posix_capabilities = *pcaplow;
+       return NT_STATUS_OK;
+}
+
+NTSTATUS cli_unix_extensions_version(struct cli_state *cli, uint16_t *pmajor,
+                                    uint16_t *pminor, uint32_t *pcaplow,
+                                    uint32_t *pcaphigh)
+{
+       TALLOC_CTX *frame = talloc_stackframe();
+       struct tevent_context *ev;
+       struct tevent_req *req;
+       NTSTATUS status = NT_STATUS_OK;
+
+       if (smbXcli_conn_has_async_calls(cli->conn)) {
+               /*
+                * Can't use sync call while an async call is in flight
+                */
+               status = NT_STATUS_INVALID_PARAMETER;
+               goto fail;
        }
 
-       *pmajor = SVAL(rdata,0);
-       *pminor = SVAL(rdata,2);
-       cli->posix_capabilities = *pcaplow = IVAL(rdata,4);
-       *pcaphigh = IVAL(rdata,8);
+       ev = samba_tevent_context_init(frame);
+       if (ev == NULL) {
+               status = NT_STATUS_NO_MEMORY;
+               goto fail;
+       }
 
-       /* todo: but not yet needed
-        *       return the other stuff
-        */
+       req = cli_unix_extensions_version_send(frame, ev, cli);
+       if (req == NULL) {
+               status = NT_STATUS_NO_MEMORY;
+               goto fail;
+       }
 
-cleanup:
-       SAFE_FREE(rparam);
-       SAFE_FREE(rdata);
+       if (!tevent_req_poll(req, ev)) {
+               status = map_nt_error_from_unix(errno);
+               goto fail;
+       }
 
-       return ret;
+       status = cli_unix_extensions_version_recv(req, pmajor, pminor, pcaplow,
+                                                 pcaphigh);
+ fail:
+       TALLOC_FREE(frame);
+       return status;
 }
 
 /****************************************************************************
  Set UNIX extensions capabilities.
 ****************************************************************************/
 
-bool cli_set_unix_extensions_capabilities(struct cli_state *cli, uint16 major, uint16 minor,
-                                        uint32 caplow, uint32 caphigh)
-{
-       bool ret = False;
-       uint16 setup;
-       char param[4];
-       char data[12];
-       char *rparam=NULL, *rdata=NULL;
-       unsigned int rparam_count=0, rdata_count=0;
+struct cli_set_unix_extensions_capabilities_state {
+       struct cli_state *cli;
+       uint16_t setup[1];
+       uint8_t param[4];
+       uint8_t data[12];
+};
 
-       setup = TRANSACT2_SETFSINFO;
+static void cli_set_unix_extensions_capabilities_done(
+       struct tevent_req *subreq);
 
-       SSVAL(param,0,0);
-       SSVAL(param,2,SMB_SET_CIFS_UNIX_INFO);
-
-       SSVAL(data,0,major);
-       SSVAL(data,2,minor);
-       SIVAL(data,4,caplow);
-       SIVAL(data,8,caphigh);
+struct tevent_req *cli_set_unix_extensions_capabilities_send(
+       TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct cli_state *cli,
+       uint16_t major, uint16_t minor, uint32_t caplow, uint32_t caphigh)
+{
+       struct tevent_req *req, *subreq;
+       struct cli_set_unix_extensions_capabilities_state *state;
 
-       if (!cli_send_trans(cli, SMBtrans2,
-                   NULL,
-                   0, 0,
-                   &setup, 1, 0,
-                   param, 4, 0,
-                   data, 12, 560)) {
-               goto cleanup;
+       req = tevent_req_create(
+               mem_ctx, &state,
+               struct cli_set_unix_extensions_capabilities_state);
+       if (req == NULL) {
+               return NULL;
        }
 
-       if (!cli_receive_trans(cli, SMBtrans2,
-                              &rparam, &rparam_count,
-                              &rdata, &rdata_count)) {
-               goto cleanup;
-       }
+       state->cli = cli;
+       SSVAL(state->setup+0, 0, TRANSACT2_SETFSINFO);
 
-       if (cli_is_error(cli)) {
-               ret = False;
-               goto cleanup;
-       } else {
-               ret = True;
-       }
+       SSVAL(state->param, 0, 0);
+       SSVAL(state->param, 2, SMB_SET_CIFS_UNIX_INFO);
 
-cleanup:
-       SAFE_FREE(rparam);
-       SAFE_FREE(rdata);
+       SSVAL(state->data, 0, major);
+       SSVAL(state->data, 2, minor);
+       SIVAL(state->data, 4, caplow);
+       SIVAL(state->data, 8, caphigh);
 
-       return ret;
+       subreq = cli_trans_send(state, ev, cli, SMBtrans2,
+                               NULL, 0, 0, 0,
+                               state->setup, 1, 0,
+                               state->param, 4, 0,
+                               state->data, 12, 560);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(
+               subreq, cli_set_unix_extensions_capabilities_done, req);
+       return req;
 }
 
-bool cli_get_fs_attr_info(struct cli_state *cli, uint32 *fs_attr)
+static void cli_set_unix_extensions_capabilities_done(
+       struct tevent_req *subreq)
 {
-       bool ret = False;
-       uint16 setup;
-       char param[2];
-       char *rparam=NULL, *rdata=NULL;
-       unsigned int rparam_count=0, rdata_count=0;
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct cli_set_unix_extensions_capabilities_state *state = tevent_req_data(
+               req, struct cli_set_unix_extensions_capabilities_state);
 
-       if (!cli||!fs_attr)
-               smb_panic("cli_get_fs_attr_info() called with NULL Pionter!");
+       NTSTATUS status = cli_trans_recv(subreq, NULL, NULL, NULL, 0, NULL,
+                                        NULL, 0, NULL, NULL, 0, NULL);
+       if (NT_STATUS_IS_OK(status)) {
+               state->cli->requested_posix_capabilities = IVAL(state->data, 4);
+       }
+       tevent_req_simple_finish_ntstatus(subreq, status);
+}
 
-       setup = TRANSACT2_QFSINFO;
+NTSTATUS cli_set_unix_extensions_capabilities_recv(struct tevent_req *req)
+{
+       return tevent_req_simple_recv_ntstatus(req);
+}
 
-       SSVAL(param,0,SMB_QUERY_FS_ATTRIBUTE_INFO);
+NTSTATUS cli_set_unix_extensions_capabilities(struct cli_state *cli,
+                                             uint16_t major, uint16 minor,
+                                             uint32_t caplow, uint32 caphigh)
+{
+       struct tevent_context *ev;
+       struct tevent_req *req;
+       NTSTATUS status = NT_STATUS_NO_MEMORY;
 
-       if (!cli_send_trans(cli, SMBtrans2,
-                   NULL,
-                   0, 0,
-                   &setup, 1, 0,
-                   param, 2, 0,
-                   NULL, 0, 560)) {
-               goto cleanup;
+       if (smbXcli_conn_has_async_calls(cli->conn)) {
+               return NT_STATUS_INVALID_PARAMETER;
        }
-
-       if (!cli_receive_trans(cli, SMBtrans2,
-                              &rparam, &rparam_count,
-                              &rdata, &rdata_count)) {
-               goto cleanup;
+       ev = samba_tevent_context_init(talloc_tos());
+       if (ev == NULL) {
+               goto fail;
        }
-
-       if (cli_is_error(cli)) {
-               ret = False;
-               goto cleanup;
-       } else {
-               ret = True;
+       req = cli_set_unix_extensions_capabilities_send(
+               ev, ev, cli, major, minor, caplow, caphigh);
+       if (req == NULL) {
+               goto fail;
        }
-
-       if (rdata_count < 12) {
-               goto cleanup;
+       if (!tevent_req_poll_ntstatus(req, ev, &status)) {
+               goto fail;
        }
-
-       *fs_attr = IVAL(rdata,0);
-
-       /* todo: but not yet needed
-        *       return the other stuff
-        */
-
-cleanup:
-       SAFE_FREE(rparam);
-       SAFE_FREE(rdata);
-
-       return ret;
+       status = cli_set_unix_extensions_capabilities_recv(req);
+fail:
+       TALLOC_FREE(ev);
+       return status;
 }
 
-bool cli_get_fs_volume_info_old(struct cli_state *cli, fstring volume_name, uint32 *pserial_number)
-{
-       bool ret = False;
-       uint16 setup;
-       char param[2];
-       char *rparam=NULL, *rdata=NULL;
-       unsigned int rparam_count=0, rdata_count=0;
-       unsigned char nlen;
+struct cli_get_fs_attr_info_state {
+       uint16_t setup[1];
+       uint8_t param[2];
+       uint32_t fs_attr;
+};
 
-       setup = TRANSACT2_QFSINFO;
+static void cli_get_fs_attr_info_done(struct tevent_req *subreq);
 
-       SSVAL(param,0,SMB_INFO_VOLUME);
+struct tevent_req *cli_get_fs_attr_info_send(TALLOC_CTX *mem_ctx,
+                                            struct tevent_context *ev,
+                                            struct cli_state *cli)
+{
+       struct tevent_req *subreq, *req;
+       struct cli_get_fs_attr_info_state *state;
 
-       if (!cli_send_trans(cli, SMBtrans2,
-                   NULL,
-                   0, 0,
-                   &setup, 1, 0,
-                   param, 2, 0,
-                   NULL, 0, 560)) {
-               goto cleanup;
+       req = tevent_req_create(mem_ctx, &state,
+                               struct cli_get_fs_attr_info_state);
+       if (req == NULL) {
+               return NULL;
        }
+       SSVAL(state->setup+0, 0, TRANSACT2_QFSINFO);
+       SSVAL(state->param+0, 0, SMB_QUERY_FS_ATTRIBUTE_INFO);
 
-       if (!cli_receive_trans(cli, SMBtrans2,
-                              &rparam, &rparam_count,
-                              &rdata, &rdata_count)) {
-               goto cleanup;
+       subreq = cli_trans_send(state, ev, cli, SMBtrans2,
+                               NULL, 0, 0, 0,
+                               state->setup, 1, 0,
+                               state->param, 2, 0,
+                               NULL, 0, 560);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
        }
+       tevent_req_set_callback(subreq, cli_get_fs_attr_info_done, req);
+       return req;
+}
 
-       if (cli_is_error(cli)) {
-               ret = False;
-               goto cleanup;
-       } else {
-               ret = True;
+static void cli_get_fs_attr_info_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct cli_get_fs_attr_info_state *state = tevent_req_data(
+               req, struct cli_get_fs_attr_info_state);
+       uint8_t *data;
+       uint32_t num_data;
+       NTSTATUS status;
+
+       status = cli_trans_recv(subreq, talloc_tos(), NULL, NULL, 0, NULL,
+                               NULL, 0, NULL, &data, 12, &num_data);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               tevent_req_nterror(req, status);
+               return;
        }
+       state->fs_attr = IVAL(data, 0);
+       TALLOC_FREE(data);
+       tevent_req_done(req);
+}
 
-       if (rdata_count < 5) {
-               goto cleanup;
-       }
+NTSTATUS cli_get_fs_attr_info_recv(struct tevent_req *req, uint32_t *fs_attr)
+{
+       struct cli_get_fs_attr_info_state *state = tevent_req_data(
+               req, struct cli_get_fs_attr_info_state);
+       NTSTATUS status;
 
-       if (pserial_number) {
-               *pserial_number = IVAL(rdata,0);
+       if (tevent_req_is_nterror(req, &status)) {
+               return status;
        }
-       nlen = CVAL(rdata,l2_vol_cch);
-       clistr_pull(cli, volume_name, rdata + l2_vol_szVolLabel, sizeof(fstring), nlen, STR_NOALIGN);
-
-       /* todo: but not yet needed
-        *       return the other stuff
-        */
+       *fs_attr = state->fs_attr;
+       return NT_STATUS_OK;
+}
 
-cleanup:
-       SAFE_FREE(rparam);
-       SAFE_FREE(rdata);
+NTSTATUS cli_get_fs_attr_info(struct cli_state *cli, uint32_t *fs_attr)
+{
+       struct tevent_context *ev;
+       struct tevent_req *req;
+       NTSTATUS status = NT_STATUS_NO_MEMORY;
 
-       return ret;
+       if (smbXcli_conn_has_async_calls(cli->conn)) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+       ev = samba_tevent_context_init(talloc_tos());
+       if (ev == NULL) {
+               goto fail;
+       }
+       req = cli_get_fs_attr_info_send(ev, ev, cli);
+       if (req == NULL) {
+               goto fail;
+       }
+       if (!tevent_req_poll_ntstatus(req, ev, &status)) {
+               goto fail;
+       }
+       status = cli_get_fs_attr_info_recv(req, fs_attr);
+fail:
+       TALLOC_FREE(ev);
+       return status;
 }
 
-bool cli_get_fs_volume_info(struct cli_state *cli, fstring volume_name, uint32 *pserial_number, time_t *pdate)
+NTSTATUS cli_get_fs_volume_info(struct cli_state *cli,
+                               TALLOC_CTX *mem_ctx,
+                               char **_volume_name,
+                               uint32_t *pserial_number,
+                               time_t *pdate)
 {
-       bool ret = False;
-       uint16 setup;
-       char param[2];
-       char *rparam=NULL, *rdata=NULL;
-       unsigned int rparam_count=0, rdata_count=0;
+       NTSTATUS status;
+       uint16_t recv_flags2;
+       uint16_t setup[1];
+       uint8_t param[2];
+       uint8_t *rdata;
+       uint32_t rdata_count;
        unsigned int nlen;
+       char *volume_name = NULL;
 
-       setup = TRANSACT2_QFSINFO;
-
+       SSVAL(setup, 0, TRANSACT2_QFSINFO);
        SSVAL(param,0,SMB_QUERY_FS_VOLUME_INFO);
 
-       if (!cli_send_trans(cli, SMBtrans2,
-                   NULL,
-                   0, 0,
-                   &setup, 1, 0,
-                   param, 2, 0,
-                   NULL, 0, 560)) {
-               goto cleanup;
-       }
-
-       if (!cli_receive_trans(cli, SMBtrans2,
-                              &rparam, &rparam_count,
-                              &rdata, &rdata_count)) {
-               goto cleanup;
-       }
-
-       if (cli_is_error(cli)) {
-               ret = False;
-               goto cleanup;
-       } else {
-               ret = True;
-       }
-
-       if (rdata_count < 19) {
-               goto cleanup;
+       status = cli_trans(talloc_tos(), cli, SMBtrans2,
+                          NULL, 0, 0, 0,
+                          setup, 1, 0,
+                          param, 2, 0,
+                          NULL, 0, 560,
+                          &recv_flags2,
+                          NULL, 0, NULL,
+                          NULL, 0, NULL,
+                          &rdata, 18, &rdata_count);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
        if (pdate) {
                struct timespec ts;
-               ts = interpret_long_date(rdata);
+               ts = interpret_long_date((char *)rdata);
                *pdate = ts.tv_sec;
        }
        if (pserial_number) {
                *pserial_number = IVAL(rdata,8);
        }
        nlen = IVAL(rdata,12);
-       clistr_pull(cli, volume_name, rdata + 18, sizeof(fstring), nlen, STR_UNICODE);
+       if (nlen > (rdata_count - 18)) {
+               TALLOC_FREE(rdata);
+               return NT_STATUS_INVALID_NETWORK_RESPONSE;
+       }
+
+       clistr_pull_talloc(mem_ctx,
+                          (const char *)rdata,
+                          recv_flags2,
+                          &volume_name,
+                          rdata + 18,
+                          nlen, STR_UNICODE);
+       if (volume_name == NULL) {
+               status = map_nt_error_from_unix(errno);
+               TALLOC_FREE(rdata);
+               return status;
+       }
 
        /* todo: but not yet needed
         *       return the other stuff
         */
 
-cleanup:
-       SAFE_FREE(rparam);
-       SAFE_FREE(rdata);
-
-       return ret;
+       *_volume_name = volume_name;
+       TALLOC_FREE(rdata);
+       return NT_STATUS_OK;
 }
 
-/******************************************************************************
- Send/receive the request encryption blob.
-******************************************************************************/
-
-static NTSTATUS enc_blob_send_receive(struct cli_state *cli, DATA_BLOB *in, DATA_BLOB *out, DATA_BLOB *param_out)
+NTSTATUS cli_get_fs_full_size_info(struct cli_state *cli,
+                                  uint64_t *total_allocation_units,
+                                  uint64_t *caller_allocation_units,
+                                  uint64_t *actual_allocation_units,
+                                  uint64_t *sectors_per_allocation_unit,
+                                  uint64_t *bytes_per_sector)
 {
-       uint16 setup;
-       char param[4];
-       char *rparam=NULL, *rdata=NULL;
-       unsigned int rparam_count=0, rdata_count=0;
-       NTSTATUS status = NT_STATUS_OK;
-
-       setup = TRANSACT2_SETFSINFO;
-
-       SSVAL(param,0,0);
-       SSVAL(param,2,SMB_REQUEST_TRANSPORT_ENCRYPTION);
-
-       if (!cli_send_trans(cli, SMBtrans2,
-                               NULL,
-                               0, 0,
-                               &setup, 1, 0,
-                               param, 4, 0,
-                               (char *)in->data, in->length, CLI_BUFFER_SIZE)) {
-               status = cli_nt_error(cli);
-               goto out;
+       uint16_t setup[1];
+       uint8_t param[2];
+       uint8_t *rdata = NULL;
+       uint32_t rdata_count;
+       NTSTATUS status;
+
+       SSVAL(setup, 0, TRANSACT2_QFSINFO);
+       SSVAL(param, 0, SMB_FS_FULL_SIZE_INFORMATION);
+
+       status = cli_trans(talloc_tos(), cli, SMBtrans2,
+                          NULL, 0, 0, 0,
+                          setup, 1, 0, /* setup */
+                          param, 2, 0,  /* param */
+                          NULL, 0, 560, /* data */
+                          NULL,
+                          NULL, 0, NULL, /* rsetup */
+                          NULL, 0, NULL, /* rparam */
+                          &rdata, 32, &rdata_count);  /* rdata */
+       if (!NT_STATUS_IS_OK(status)) {
+               goto fail;
        }
 
-       if (!cli_receive_trans(cli, SMBtrans2,
-                               &rparam, &rparam_count,
-                               &rdata, &rdata_count)) {
-               status = cli_nt_error(cli);
-               goto out;
+       if (total_allocation_units) {
+                *total_allocation_units = BIG_UINT(rdata, 0);
        }
-
-       if (cli_is_error(cli)) {
-               status = cli_nt_error(cli);
-               if (!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
-                       goto out;
-               }
+       if (caller_allocation_units) {
+               *caller_allocation_units = BIG_UINT(rdata,8);
+       }
+       if (actual_allocation_units) {
+               *actual_allocation_units = BIG_UINT(rdata,16);
+       }
+       if (sectors_per_allocation_unit) {
+               *sectors_per_allocation_unit = IVAL(rdata,24);
+       }
+       if (bytes_per_sector) {
+               *bytes_per_sector = IVAL(rdata,28);
        }
 
-       *out = data_blob(rdata, rdata_count);
-       *param_out = data_blob(rparam, rparam_count);
+fail:
+       TALLOC_FREE(rdata);
+       return status;
+}
 
-  out:
+NTSTATUS cli_get_posix_fs_info(struct cli_state *cli,
+                              uint32_t *optimal_transfer_size,
+                              uint32_t *block_size,
+                              uint64_t *total_blocks,
+                              uint64_t *blocks_available,
+                              uint64_t *user_blocks_available,
+                              uint64_t *total_file_nodes,
+                              uint64_t *free_file_nodes,
+                              uint64_t *fs_identifier)
+{
+       uint16_t setup[1];
+       uint8_t param[2];
+       uint8_t *rdata = NULL;
+       uint32_t rdata_count;
+       NTSTATUS status;
+
+       SSVAL(setup, 0, TRANSACT2_QFSINFO);
+       SSVAL(param,0,SMB_QUERY_POSIX_FS_INFO);
+
+       status = cli_trans(talloc_tos(), cli, SMBtrans2, NULL, 0, 0, 0,
+                          setup, 1, 0,
+                          param, 2, 0,
+                          NULL, 0, 560,
+                          NULL,
+                          NULL, 0, NULL, /* rsetup */
+                          NULL, 0, NULL, /* rparam */
+                          &rdata, 56, &rdata_count);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
 
-       SAFE_FREE(rparam);
-       SAFE_FREE(rdata);
-       return status;
+       if (optimal_transfer_size) {
+                *optimal_transfer_size = IVAL(rdata, 0);
+       }
+       if (block_size) {
+               *block_size = IVAL(rdata,4);
+       }
+       if (total_blocks) {
+               *total_blocks = BIG_UINT(rdata,8);
+       }
+       if (blocks_available) {
+               *blocks_available = BIG_UINT(rdata,16);
+       }
+       if (user_blocks_available) {
+               *user_blocks_available = BIG_UINT(rdata,24);
+       }
+       if (total_file_nodes) {
+               *total_file_nodes = BIG_UINT(rdata,32);
+       }
+       if (free_file_nodes) {
+               *free_file_nodes = BIG_UINT(rdata,40);
+       }
+       if (fs_identifier) {
+               *fs_identifier = BIG_UINT(rdata,48);
+       }
+       return NT_STATUS_OK;
 }
 
+
 /******************************************************************************
Make a client state struct.
Send/receive the request encryption blob.
 ******************************************************************************/
 
-static struct smb_trans_enc_state *make_cli_enc_state(enum smb_trans_enc_type smb_enc_type)
+static NTSTATUS enc_blob_send_receive(struct cli_state *cli, DATA_BLOB *in, DATA_BLOB *out, DATA_BLOB *param_out)
 {
-       struct smb_trans_enc_state *es = NULL;
-       es = SMB_MALLOC_P(struct smb_trans_enc_state);
-       if (!es) {
-               return NULL;
-       }
-       ZERO_STRUCTP(es);
-       es->smb_enc_type = smb_enc_type;
+       uint16_t setup[1];
+       uint8_t param[4];
+       uint8_t *rparam=NULL, *rdata=NULL;
+       uint32_t num_rparam, num_rdata;
+       NTSTATUS status;
 
-       if (smb_enc_type == SMB_TRANS_ENC_GSS) {
-#if defined(HAVE_GSSAPI) && defined(HAVE_KRB5)
-               es->s.gss_state = SMB_MALLOC_P(struct smb_tran_enc_state_gss);
-               if (!es->s.gss_state) {
-                       SAFE_FREE(es);
-                       return NULL;
-               }
-               ZERO_STRUCTP(es->s.gss_state);
-#else
-               DEBUG(0,("make_cli_enc_state: no krb5 compiled.\n"));
-               SAFE_FREE(es);
-               return NULL;
-#endif
+       SSVAL(setup+0, 0, TRANSACT2_SETFSINFO);
+       SSVAL(param,0,0);
+       SSVAL(param,2,SMB_REQUEST_TRANSPORT_ENCRYPTION);
+
+       status = cli_trans(talloc_tos(), cli, SMBtrans2, NULL, 0, 0, 0,
+                          setup, 1, 0,
+                          param, 4, 2,
+                          (uint8_t *)in->data, in->length, CLI_BUFFER_SIZE,
+                          NULL,          /* recv_flags */
+                          NULL, 0, NULL, /* rsetup */
+                          &rparam, 0, &num_rparam,
+                          &rdata, 0, &num_rdata);
+
+       if (!NT_STATUS_IS_OK(status) &&
+           !NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+               return status;
        }
-       return es;
+
+       *out = data_blob(rdata, num_rdata);
+       *param_out = data_blob(rparam, num_rparam);
+
+       TALLOC_FREE(rparam);
+       TALLOC_FREE(rdata);
+       return status;
 }
 
 /******************************************************************************
@@ -398,31 +585,37 @@ NTSTATUS cli_raw_ntlm_smb_encryption_start(struct cli_state *cli,
        DATA_BLOB blob_out = data_blob_null;
        DATA_BLOB param_out = data_blob_null;
        NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
-       struct smb_trans_enc_state *es = make_cli_enc_state(SMB_TRANS_ENC_NTLM);
-
+       struct auth_generic_state *auth_generic_state;
+       struct smb_trans_enc_state *es = talloc_zero(NULL, struct smb_trans_enc_state);
        if (!es) {
                return NT_STATUS_NO_MEMORY;
        }
-       status = ntlmssp_client_start(&es->s.ntlmssp_state);
+       status = auth_generic_client_prepare(es,
+                                            &auth_generic_state);
        if (!NT_STATUS_IS_OK(status)) {
                goto fail;
        }
 
-       ntlmssp_want_feature(es->s.ntlmssp_state, NTLMSSP_FEATURE_SESSION_KEY);
-       es->s.ntlmssp_state->neg_flags |= (NTLMSSP_NEGOTIATE_SIGN|NTLMSSP_NEGOTIATE_SEAL);
+       gensec_want_feature(auth_generic_state->gensec_security, GENSEC_FEATURE_SESSION_KEY);
+       gensec_want_feature(auth_generic_state->gensec_security, GENSEC_FEATURE_SEAL);
 
-       if (!NT_STATUS_IS_OK(status = ntlmssp_set_username(es->s.ntlmssp_state, user))) {
+       if (!NT_STATUS_IS_OK(status = auth_generic_set_username(auth_generic_state, user))) {
                goto fail;
        }
-       if (!NT_STATUS_IS_OK(status = ntlmssp_set_domain(es->s.ntlmssp_state, domain))) {
+       if (!NT_STATUS_IS_OK(status = auth_generic_set_domain(auth_generic_state, domain))) {
                goto fail;
        }
-       if (!NT_STATUS_IS_OK(status = ntlmssp_set_password(es->s.ntlmssp_state, pass))) {
+       if (!NT_STATUS_IS_OK(status = auth_generic_set_password(auth_generic_state, pass))) {
+               goto fail;
+       }
+
+       if (!NT_STATUS_IS_OK(status = auth_generic_client_start(auth_generic_state, GENSEC_OID_NTLMSSP))) {
                goto fail;
        }
 
        do {
-               status = ntlmssp_update(es->s.ntlmssp_state, blob_in, &blob_out);
+               status = gensec_update(auth_generic_state->gensec_security, auth_generic_state,
+                                      blob_in, &blob_out);
                data_blob_free(&blob_in);
                data_blob_free(&param_out);
                if (NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED) || NT_STATUS_IS_OK(status)) {
@@ -446,162 +639,69 @@ NTSTATUS cli_raw_ntlm_smb_encryption_start(struct cli_state *cli,
        data_blob_free(&blob_in);
 
        if (NT_STATUS_IS_OK(status)) {
+               es->enc_on = true;
                /* Replace the old state, if any. */
-               if (cli->trans_enc_state) {
-                       common_free_encryption_state(&cli->trans_enc_state);
-               }
-               cli->trans_enc_state = es;
-               cli->trans_enc_state->enc_on = True;
+               /* We only need the gensec_security part from here.
+                * es is a malloc()ed pointer, so we cannot make
+                * gensec_security a talloc child */
+               es->gensec_security = talloc_move(NULL,
+                                                 &auth_generic_state->gensec_security);
+               smb1cli_conn_set_encryption(cli->conn, es);
                es = NULL;
        }
 
   fail:
-
-       common_free_encryption_state(&es);
+       TALLOC_FREE(es);
        return status;
 }
 
-#if defined(HAVE_GSSAPI) && defined(HAVE_KRB5)
-
-#ifndef SMB_GSS_REQUIRED_FLAGS
-#define SMB_GSS_REQUIRED_FLAGS (GSS_C_CONF_FLAG|GSS_C_INTEG_FLAG|GSS_C_MUTUAL_FLAG|GSS_C_REPLAY_FLAG|GSS_C_SEQUENCE_FLAG)
-#endif
-
 /******************************************************************************
Get client gss blob to send to a server.
Start a SPNEGO gssapi encryption context.
 ******************************************************************************/
 
-static NTSTATUS make_cli_gss_blob(struct smb_trans_enc_state *es,
-                               const char *service,
-                               const char *host,
-                               NTSTATUS status_in,
-                               DATA_BLOB spnego_blob_in,
-                               DATA_BLOB *p_blob_out)
+NTSTATUS cli_gss_smb_encryption_start(struct cli_state *cli)
 {
-       const char *krb_mechs[] = {OID_KERBEROS5, NULL};
-       OM_uint32 ret;
-       OM_uint32 min;
-       gss_name_t srv_name;
-       gss_buffer_desc input_name;
-       gss_buffer_desc *p_tok_in;
-       gss_buffer_desc tok_out, tok_in;
-       DATA_BLOB blob_out = data_blob_null;
-       DATA_BLOB blob_in = data_blob_null;
-       char *host_princ_s = NULL;
-       OM_uint32 ret_flags = 0;
-       NTSTATUS status = NT_STATUS_OK;
-
-       gss_OID_desc nt_hostbased_service =
-       {10, CONST_DISCARD(char *,"\x2a\x86\x48\x86\xf7\x12\x01\x02\x01\x04")};
-
-       memset(&tok_out, '\0', sizeof(tok_out));
+       DATA_BLOB blob_recv = data_blob_null;
+       DATA_BLOB blob_send = data_blob_null;
+       DATA_BLOB param_out = data_blob_null;
+       NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+       struct auth_generic_state *auth_generic_state;
+       struct smb_trans_enc_state *es = talloc_zero(NULL, struct smb_trans_enc_state);
 
-       /* Get a ticket for the service@host */
-       asprintf(&host_princ_s, "%s@%s", service, host);
-       if (host_princ_s == NULL) {
+       if (!es) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       input_name.value = host_princ_s;
-       input_name.length = strlen(host_princ_s) + 1;
-
-       ret = gss_import_name(&min,
-                               &input_name,
-                               &nt_hostbased_service,
-                               &srv_name);
-
-       if (ret != GSS_S_COMPLETE) {
-               SAFE_FREE(host_princ_s);
-               return map_nt_error_from_gss(ret, min);
-       }
-
-       if (spnego_blob_in.length == 0) {
-               p_tok_in = GSS_C_NO_BUFFER;
-       } else {
-               /* Remove the SPNEGO wrapper */
-               if (!spnego_parse_auth_response(spnego_blob_in, status_in, OID_KERBEROS5, &blob_in)) {
-                       status = NT_STATUS_UNSUCCESSFUL;
-                       goto fail;
-               }
-               tok_in.value = blob_in.data;
-               tok_in.length = blob_in.length;
-               p_tok_in = &tok_in;
-       }
-
-       ret = gss_init_sec_context(&min,
-                               GSS_C_NO_CREDENTIAL, /* Use our default cred. */
-                               &es->s.gss_state->gss_ctx,
-                               srv_name,
-                               GSS_C_NO_OID, /* default OID. */
-                               GSS_C_MUTUAL_FLAG | GSS_C_REPLAY_FLAG | GSS_C_SEQUENCE_FLAG,
-                               GSS_C_INDEFINITE,       /* requested ticket lifetime. */
-                               NULL,   /* no channel bindings */
-                               p_tok_in,
-                               NULL,   /* ignore mech type */
-                               &tok_out,
-                               &ret_flags,
-                               NULL);  /* ignore time_rec */
-
-       status = map_nt_error_from_gss(ret, min);
-       if (!NT_STATUS_IS_OK(status) && !NT_STATUS_EQUAL(status,NT_STATUS_MORE_PROCESSING_REQUIRED)) {
-               ADS_STATUS adss = ADS_ERROR_GSS(ret, min);
-               DEBUG(10,("make_cli_gss_blob: gss_init_sec_context failed with %s\n",
-                       ads_errstr(adss)));
+       status = auth_generic_client_prepare(es,
+                                            &auth_generic_state);
+       if (!NT_STATUS_IS_OK(status)) {
                goto fail;
        }
 
-       if ((ret_flags & SMB_GSS_REQUIRED_FLAGS) != SMB_GSS_REQUIRED_FLAGS) {
-               status = NT_STATUS_ACCESS_DENIED;
-       }
-
-       blob_out = data_blob(tok_out.value, tok_out.length);
+       gensec_want_feature(auth_generic_state->gensec_security, GENSEC_FEATURE_SESSION_KEY);
+       gensec_want_feature(auth_generic_state->gensec_security, GENSEC_FEATURE_SEAL);
 
-       /* Wrap in an SPNEGO wrapper */
-       *p_blob_out = gen_negTokenTarg(krb_mechs, blob_out);
+       cli_credentials_set_kerberos_state(auth_generic_state->credentials, 
+                                          CRED_MUST_USE_KERBEROS);
 
-  fail:
-
-       data_blob_free(&blob_out);
-       data_blob_free(&blob_in);
-       SAFE_FREE(host_princ_s);
-       gss_release_name(&min, &srv_name);
-       if (tok_out.value) {
-               gss_release_buffer(&min, &tok_out);
+       status = gensec_set_target_service(auth_generic_state->gensec_security, "cifs");
+       if (!NT_STATUS_IS_OK(status)) {
+               goto fail;
        }
-       return status;
-}
 
-/******************************************************************************
- Start a SPNEGO gssapi encryption context.
-******************************************************************************/
-
-NTSTATUS cli_gss_smb_encryption_start(struct cli_state *cli)
-{
-       DATA_BLOB blob_recv = data_blob_null;
-       DATA_BLOB blob_send = data_blob_null;
-       DATA_BLOB param_out = data_blob_null;
-       NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
-       fstring fqdn;
-       const char *servicename;
-       struct smb_trans_enc_state *es = make_cli_enc_state(SMB_TRANS_ENC_GSS);
-
-       if (!es) {
-               return NT_STATUS_NO_MEMORY;
+       status = gensec_set_target_hostname(auth_generic_state->gensec_security, 
+                                           smbXcli_conn_remote_name(cli->conn));
+       if (!NT_STATUS_IS_OK(status)) {
+               goto fail;
        }
 
-       name_to_fqdn(fqdn, cli->desthost);
-       strlower_m(fqdn);
-
-       servicename = "cifs";
-       status = make_cli_gss_blob(es, servicename, fqdn, NT_STATUS_OK, blob_recv, &blob_send);
-       if (!NT_STATUS_EQUAL(status,NT_STATUS_MORE_PROCESSING_REQUIRED)) {
-               servicename = "host";
-               status = make_cli_gss_blob(es, servicename, fqdn, NT_STATUS_OK, blob_recv, &blob_send);
-               if (!NT_STATUS_EQUAL(status,NT_STATUS_MORE_PROCESSING_REQUIRED)) {
-                       goto fail;
-               }
+       if (!NT_STATUS_IS_OK(status = auth_generic_client_start(auth_generic_state, GENSEC_OID_SPNEGO))) {
+               goto fail;
        }
 
+       status = gensec_update(auth_generic_state->gensec_security, talloc_tos(),
+                              blob_recv, &blob_send);
+
        do {
                data_blob_free(&blob_recv);
                status = enc_blob_send_receive(cli, &blob_send, &blob_recv, &param_out);
@@ -609,31 +709,35 @@ NTSTATUS cli_gss_smb_encryption_start(struct cli_state *cli)
                        es->enc_ctx_num = SVAL(param_out.data, 0);
                }
                data_blob_free(&blob_send);
-               status = make_cli_gss_blob(es, servicename, fqdn, status, blob_recv, &blob_send);
+               status = gensec_update(auth_generic_state->gensec_security, talloc_tos(),
+                                      blob_recv, &blob_send);
        } while (NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED));
        data_blob_free(&blob_recv);
 
        if (NT_STATUS_IS_OK(status)) {
-               /* Replace the old state, if any. */
-               if (cli->trans_enc_state) {
-                       common_free_encryption_state(&cli->trans_enc_state);
+               if (!gensec_have_feature(auth_generic_state->gensec_security, 
+                                        GENSEC_FEATURE_SIGN) ||
+                   !gensec_have_feature(auth_generic_state->gensec_security, 
+                                        GENSEC_FEATURE_SEAL)) {
+                       status = NT_STATUS_ACCESS_DENIED;
                }
-               cli->trans_enc_state = es;
-               cli->trans_enc_state->enc_on = True;
-               es = NULL;
        }
 
-  fail:
-
-       common_free_encryption_state(&es);
+       if (NT_STATUS_IS_OK(status)) {
+               es->enc_on = true;
+               /* Replace the old state, if any. */
+               /* We only need the gensec_security part from here.
+                * es is a malloc()ed pointer, so we cannot make
+                * gensec_security a talloc child */
+               es->gensec_security = talloc_move(es,
+                                                 &auth_generic_state->gensec_security);
+               smb1cli_conn_set_encryption(cli->conn, es);
+               es = NULL;
+       }
+fail:
+       TALLOC_FREE(es);
        return status;
 }
-#else
-NTSTATUS cli_gss_smb_encryption_start(struct cli_state *cli)
-{
-       return NT_STATUS_NOT_SUPPORTED;
-}
-#endif
 
 /********************************************************************
  Ensure a connection is encrypted.
@@ -644,14 +748,19 @@ NTSTATUS cli_force_encryption(struct cli_state *c,
                        const char *password,
                        const char *domain)
 {
-       uint16 major, minor;
-       uint32 caplow, caphigh;
+       uint16_t major, minor;
+       uint32_t caplow, caphigh;
+       NTSTATUS status;
 
        if (!SERVER_HAS_UNIX_CIFS(c)) {
                return NT_STATUS_NOT_SUPPORTED;
        }
 
-       if (!cli_unix_extensions_version(c, &major, &minor, &caplow, &caphigh)) {
+       status = cli_unix_extensions_version(c, &major, &minor, &caplow,
+                                            &caphigh);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(10, ("cli_force_encryption: cli_unix_extensions_version "
+                          "returned %s\n", nt_errstr(status)));
                return NT_STATUS_UNKNOWN_REVISION;
        }