Finish removal of iconv_convenience in public API's.

[bbaumbach/samba-autobuild/.git] / source4 / smb_server / smb / nttrans.c

diff --git a/source4/smb_server/smb/nttrans.c b/source4/smb_server/smb/nttrans.c
index 23eb04ba2eefff360a73df32792990555d45c170..cfef9d18a42f4fe84f9fb8aaa776bc09dd73081b 100644 (file)
--- a/source4/smb_server/smb/nttrans.c
+++ b/source4/smb_server/smb/nttrans.c
@@ -119,7 +119,7 @@ static NTSTATUS nttrans_create(struct smbsrv_request *req,
        params = trans->in.params.data;
 
        io->ntcreatex.in.flags            = IVAL(params,  0);
-       io->ntcreatex.in.root_fid.ntvfs   = smbsrv_pull_fnum(req, req->in.vwv, 4);
+       io->ntcreatex.in.root_fid.ntvfs   = smbsrv_pull_fnum(req, params, 4);
        io->ntcreatex.in.access_mask      = IVAL(params,  8);
        io->ntcreatex.in.alloc_size       = BVAL(params, 12);
        io->ntcreatex.in.file_attr        = IVAL(params, 20);
@@ -134,6 +134,7 @@ static NTSTATUS nttrans_create(struct smbsrv_request *req,
        io->ntcreatex.in.sec_desc         = NULL;
        io->ntcreatex.in.ea_list          = NULL;
        io->ntcreatex.in.query_maximal_access = false;
+       io->ntcreatex.in.private_flags    = 0;
 
        req_pull_string(&req->in.bufinfo, &io->ntcreatex.in.fname, 
                        params + 53, 
@@ -158,7 +159,7 @@ static NTSTATUS nttrans_create(struct smbsrv_request *req,
                if (io->ntcreatex.in.sec_desc == NULL) {
                        return NT_STATUS_NO_MEMORY;
                }
-               ndr_err = ndr_pull_struct_blob(&blob, io, NULL,
+               ndr_err = ndr_pull_struct_blob(&blob, io, 
                                               io->ntcreatex.in.sec_desc,
                                               (ndr_pull_flags_fn_t)ndr_pull_security_descriptor);
                if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -205,7 +206,7 @@ static NTSTATUS nttrans_query_sec_desc_send(struct nttrans_op *op)
        NT_STATUS_NOT_OK_RETURN(status);
        params = op->trans->out.params.data;
 
-       ndr_err = ndr_push_struct_blob(&op->trans->out.data, op, NULL,
+       ndr_err = ndr_push_struct_blob(&op->trans->out.data, op, 
                                       io->query_secdesc.out.sd,
                                       (ndr_push_flags_fn_t)ndr_push_security_descriptor);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -271,7 +272,7 @@ static NTSTATUS nttrans_set_sec_desc(struct smbsrv_request *req,
        io->set_secdesc.in.sd = talloc(io, struct security_descriptor);
        NT_STATUS_HAVE_NO_MEMORY(io->set_secdesc.in.sd);
 
-       ndr_err = ndr_pull_struct_blob(&trans->in.data, req, NULL,
+       ndr_err = ndr_pull_struct_blob(&trans->in.data, req, 
                                       io->set_secdesc.in.sd,
                                       (ndr_pull_flags_fn_t)ndr_pull_security_descriptor);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -527,7 +528,7 @@ static void reply_nttrans_send(struct ntvfs_request *ntvfs)
           the negotiated buffer size */
        do {
                uint32_t this_data, this_param, max_bytes;
-               uint_t align1 = 1, align2 = (params_left ? 2 : 0);
+               unsigned int align1 = 1, align2 = (params_left ? 2 : 0);
                struct smbsrv_request *this_req;
 
                max_bytes = req_max_data(req) - (align1 + align2);