Changeset 740 for vendor/current/source4/ntvfs/ipc

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

Location:

vendor/current/source4/ntvfs/ipc

Files:

• ipc_rap.c (modified) (5 diffs)
• rap_server.c (modified) (4 diffs)
• vfs_ipc.c (modified) (16 diffs)

vendor/current/source4/ntvfs/ipc/ipc_rap.c

@@ -21 +21 @@
 #include "includes.h"
 #include "libcli/raw/interfaces.h"
-#include "libcli/rap/rap.h"
+#include "../librpc/gen_ndr/rap.h"
 #include "events/events.h"
 #include "ntvfs/ipc/proto.h"
@@ -125 +125 @@
         call->mem_ctx = mem_ctx;
 
-        call->ndr_pull_param = ndr_pull_init_blob(&trans->in.params, mem_ctx, lp_iconv_convenience(lp_ctx));
+        call->ndr_pull_param = ndr_pull_init_blob(&trans->in.params, mem_ctx);
         call->ndr_pull_param->flags = RAPNDR_FLAGS;
 
-        call->ndr_pull_data = ndr_pull_init_blob(&trans->in.data, mem_ctx, lp_iconv_convenience(lp_ctx));
+        call->ndr_pull_data = ndr_pull_init_blob(&trans->in.data, mem_ctx);
         call->ndr_pull_data->flags = RAPNDR_FLAGS;
 
@@ -292 +292 @@
                 case 0:
                         NDR_GOTO(ndr_push_bytes(call->ndr_push_data,
-                                              (const uint8_t *)r.out.info[i].info0.name,
-                                              sizeof(r.out.info[i].info0.name)));
+                                              (const uint8_t *)r.out.info[i].info0.share_name,
+                                              sizeof(r.out.info[i].info0.share_name)));
                         break;
                 case 1:
                         NDR_GOTO(ndr_push_bytes(call->ndr_push_data,
-                                              (const uint8_t *)r.out.info[i].info1.name,
-                                              sizeof(r.out.info[i].info1.name)));
+                                              (const uint8_t *)r.out.info[i].info1.share_name,
+                                              sizeof(r.out.info[i].info1.share_name)));
                         NDR_GOTO(ndr_push_uint8(call->ndr_push_data,
-                                              NDR_SCALARS, r.out.info[i].info1.pad));
+                                              NDR_SCALARS, r.out.info[i].info1.reserved1));
                         NDR_GOTO(ndr_push_uint16(call->ndr_push_data,
-                                               NDR_SCALARS, r.out.info[i].info1.type));
+                                               NDR_SCALARS, r.out.info[i].info1.share_type));
 
                         RAP_GOTO(rap_push_string(call->ndr_push_data,
@@ -455 +455 @@
                                   &call->datadesc));
 
-        call->ndr_push_param = ndr_push_init_ctx(call, lp_iconv_convenience(lp_ctx));
-        call->ndr_push_data = ndr_push_init_ctx(call, lp_iconv_convenience(lp_ctx));
+        call->ndr_push_param = ndr_push_init_ctx(call);
+        call->ndr_push_data = ndr_push_init_ctx(call);
 
         if ((call->ndr_push_param == NULL) || (call->ndr_push_data == NULL))
@@ -481 +481 @@
         result_data = ndr_push_blob(call->ndr_push_data);
 
-        final_param = ndr_push_init_ctx(call, lp_iconv_convenience(lp_ctx));
-        final_data = ndr_push_init_ctx(call, lp_iconv_convenience(lp_ctx));
+        final_param = ndr_push_init_ctx(call);
+        final_data = ndr_push_init_ctx(call);
 
         if ((final_param == NULL) || (final_data == NULL))

vendor/current/source4/ntvfs/ipc/rap_server.c

@@ -21 +21 @@
 #include "includes.h"
 #include "param/share.h"
-#include "libcli/rap/rap.h"
+#include "../librpc/gen_ndr/rap.h"
 #include "libcli/raw/interfaces.h"
 #include "librpc/gen_ndr/srvsvc.h"
+#include "librpc/gen_ndr/dcerpc.h"
 #include "rpc_server/common/common.h"
+#include "rpc_server/common/share.h"
 #include "param/param.h"
 #include "ntvfs/ipc/ipc.h"
@@ -47 +49 @@
         r->out.info = NULL;
 
-        nterr = share_get_context_by_name(mem_ctx, lp_share_backend(lp_ctx), event_ctx, lp_ctx, &sctx);
+        nterr = share_get_context_by_name(mem_ctx, lpcfg_share_backend(lp_ctx), event_ctx, lp_ctx, &sctx);
         if (!NT_STATUS_IS_OK(nterr)) {
                 return nterr;
@@ -59 +61 @@
         r->out.available = count;
         r->out.info = talloc_array(mem_ctx,
-                                   union rap_shareenum_info, r->out.available);
+                                   union rap_share_info, r->out.available);
 
         for (i = 0, j = 0; i < r->out.available; i++) {
@@ -66 +68 @@
                         continue;
                 }
-                strncpy(r->out.info[j].info1.name,
+                strncpy((char *)r->out.info[j].info1.share_name,
                         snames[i],
-                        sizeof(r->out.info[0].info1.name));
-                r->out.info[i].info1.pad = 0;
-                r->out.info[i].info1.type = dcesrv_common_get_share_type(mem_ctx, NULL, scfg);
+                        sizeof(r->out.info[0].info1.share_name));
+                r->out.info[i].info1.reserved1 = 0;
+                r->out.info[i].info1.share_type = dcesrv_common_get_share_type(mem_ctx, NULL, scfg);
                 r->out.info[i].info1.comment = talloc_strdup(mem_ctx, share_string_option(scfg, SHARE_COMMENT, ""));
                 talloc_free(scfg);

vendor/current/source4/ntvfs/ipc/vfs_ipc.c

@@ -28 +28 @@
 #include "../lib/util/dlinklist.h"
 #include "ntvfs/ntvfs.h"
-#include "libcli/rap/rap.h"
+#include "../librpc/gen_ndr/rap.h"
 #include "ntvfs/ipc/proto.h"
 #include "libcli/raw/ioctl.h"
@@ -218 +218 @@
         struct ntvfs_request *req;
         union smb_open *oi;
-        struct netr_SamInfo3 *info3;
+        struct auth_session_info_transport *session_info_transport;
 };
 
@@ -229 +229 @@
 {
         while (*name) {
-                if (!isalnum(*name)) return NT_STATUS_INVALID_PARAMETER;
+                if (!isalnum(*name) && *name != '_') {
+                        return NT_STATUS_INVALID_PARAMETER;
+                }
                 name++;
         }
@@ -245 +247 @@
         struct ipc_private *ipriv = talloc_get_type_abort(ntvfs->private_data,
                                     struct ipc_private);
-        struct smb_iconv_convenience *smb_ic
-                = lp_iconv_convenience(ipriv->ntvfs->ctx->lp_ctx);
         struct ntvfs_handle *h;
         struct ipc_open_state *state;
@@ -252 +252 @@
         const char *fname;
         const char *directory;
-        struct socket_address *client_sa;
-        struct tsocket_address *client_addr;
-        struct socket_address *server_sa;
-        struct tsocket_address *server_addr;
-        int ret;
-        DATA_BLOB delegated_creds = data_blob_null;
+        const struct tsocket_address *client_addr;
+        const struct tsocket_address *server_addr;
 
         switch (oi->generic.level) {
         case RAW_OPEN_NTCREATEX:
+        case RAW_OPEN_NTTRANS_CREATE:
                 fname = oi->ntcreatex.in.fname;
                 break;
@@ -270 +267 @@
                 break;
         default:
-                status = NT_STATUS_NOT_SUPPORTED;
-                break;
+                return NT_STATUS_NOT_SUPPORTED;
         }
 
         directory = talloc_asprintf(req, "%s/np",
-                                    lp_ncalrpc_dir(ipriv->ntvfs->ctx->lp_ctx));
+                                    lpcfg_ncalrpc_dir(ipriv->ntvfs->ctx->lp_ctx));
         NT_STATUS_HAVE_NO_MEMORY(directory);
 
@@ -312 +308 @@
         state->oi = oi;
 
-        status = auth_convert_server_info_saminfo3(state,
-                                                   req->session_info->server_info,
-                                                   &state->info3);
+        status = auth_session_info_transport_from_session(state,
+                                                          req->session_info,
+                                                          ipriv->ntvfs->ctx->event_ctx,
+                                                          ipriv->ntvfs->ctx->lp_ctx,
+                                                          &state->session_info_transport);
+
         NT_STATUS_NOT_OK_RETURN(status);
 
-        client_sa = ntvfs_get_peer_addr(ntvfs, state);
-        if (!client_sa) {
-                return NT_STATUS_INTERNAL_ERROR;
-        }
-
-        server_sa = ntvfs_get_my_addr(ntvfs, state);
-        if (!server_sa) {
-                return NT_STATUS_INTERNAL_ERROR;
-        }
-
-        ret = tsocket_address_inet_from_strings(state, "ip",
-                                                client_sa->addr,
-                                                client_sa->port,
-                                                &client_addr);
-        if (ret == -1) {
-                status = map_nt_error_from_unix(errno);
-                return status;
-        }
-
-        ret = tsocket_address_inet_from_strings(state, "ip",
-                                                server_sa->addr,
-                                                server_sa->port,
-                                                &server_addr);
-        if (ret == -1) {
-                status = map_nt_error_from_unix(errno);
-                return status;
-        }
-
-        if (req->session_info->credentials) {
-                struct gssapi_creds_container *gcc;
-                OM_uint32 gret;
-                OM_uint32 minor_status;
-                gss_buffer_desc cred_token;
-
-                ret = cli_credentials_get_client_gss_creds(req->session_info->credentials,
-                                                           ipriv->ntvfs->ctx->event_ctx,
-                                                           ipriv->ntvfs->ctx->lp_ctx,
-                                                           &gcc);
-                if (ret) {
-                        goto skip;
-                }
-
-                gret = gss_export_cred(&minor_status,
-                                       gcc->creds,
-                                       &cred_token);
-                if (gret != GSS_S_COMPLETE) {
-                        return NT_STATUS_INTERNAL_ERROR;
-                }
-
-                if (cred_token.length) {
-                        delegated_creds = data_blob_talloc(req,
-                                                           cred_token.value,
-                                                           cred_token.length);
-                        gss_release_buffer(&minor_status, &cred_token);
-                        NT_STATUS_HAVE_NO_MEMORY(delegated_creds.data);
-                }
-        }
-
-skip:
+        client_addr = ntvfs_get_local_address(ipriv->ntvfs);
+        server_addr = ntvfs_get_remote_address(ipriv->ntvfs);
 
         subreq = tstream_npa_connect_send(p,
                                           ipriv->ntvfs->ctx->event_ctx,
-                                          smb_ic,
                                           directory,
                                           fname,
@@ -386 +327 @@
                                           server_addr,
                                           NULL,
-                                          state->info3,
-                                          req->session_info->session_key,
-                                          delegated_creds);
+                                          state->session_info_transport);
         NT_STATUS_HAVE_NO_MEMORY(subreq);
         tevent_req_set_callback(subreq, ipc_open_done, state);
@@ -531 +470 @@
         s->buf = buf;
         s->len = MIN(len, UINT16_MAX);
-        //DEBUG(0,("readv_next_vector_init[%u 0x%04X]\n", s->len, s->len));
 }
 
@@ -549 +487 @@
                 *_vector = NULL;
                 *count = 0;
-//              DEBUG(0,("readv_next_vector done ofs[%u 0x%04X]\n",
-//                      state->ofs, state->ofs));
                 return 0;
         }
@@ -563 +499 @@
                 *_vector = NULL;
                 *count = 0;
-//              DEBUG(0,("readv_next_vector short read ofs[%u 0x%04X]\n",
-//                      state->ofs, state->ofs));
                 return 0;
         }
@@ -588 +522 @@
         }
 
-        vector[0].iov_base = state->buf + state->ofs;
+        vector[0].iov_base = (char *) (state->buf + state->ofs);
         vector[0].iov_len = wanted;
 
@@ -928 +862 @@
                 return ntvfs_map_qfileinfo(ntvfs, req, info);
         }
-        
-        return NT_STATUS_ACCESS_DENIED;
 }
 
@@ -1041 +973 @@
         state->req = req;
         state->trans = trans;
-        state->writev_iov.iov_base = trans->in.data.data;
+        state->writev_iov.iov_base = (char *) trans->in.data.data;
         state->writev_iov.iov_len = trans->in.data.length;
 
@@ -1250 +1182 @@
         state->req = req;
         state->io = io;
-        state->writev_iov.iov_base = io->smb2.in.out.data;
+        state->writev_iov.iov_base = (char *) io->smb2.in.out.data;
         state->writev_iov.iov_len = io->smb2.in.out.length;
 
@@ -1352 +1284 @@
                 return NT_STATUS_ACCESS_DENIED;
         }
-
-        return NT_STATUS_ACCESS_DENIED;
 }