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

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

Location:

vendor/current/source4/ntvfs/ipc

Files:

• ipc_rap.c (modified) (4 diffs)
• rap_server.c (modified) (1 diff)
• vfs_ipc.c (modified) (14 diffs)

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

@@ -256 +256 @@
         struct rap_NetShareEnum r;
         NTSTATUS result;
+        uint32_t offset_save = 0;
+        struct rap_heap_save heap_save = {0};
 
         RAP_GOTO(rap_srv_pull_word(call, &r.in.level));
@@ -283 +285 @@
 
                 int i = r.out.count;
-                uint32_t offset_save;
-                struct rap_heap_save heap_save;
 
                 offset_save = call->ndr_push_data->offset;
@@ -336 +336 @@
         struct rap_NetServerEnum2 r;
         NTSTATUS result;
+        uint32_t offset_save = 0;
+        struct rap_heap_save heap_save = {0};
 
         RAP_GOTO(rap_srv_pull_word(call, &r.in.level));
@@ -365 +367 @@
 
                 int i = r.out.count;
-                uint32_t offset_save;
-                struct rap_heap_save heap_save;
 
                 offset_save = call->ndr_push_data->offset;

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

@@ -73 +73 @@
                 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, ""));
+                r->out.info[i].info1.comment = share_string_option(mem_ctx, scfg, SHARE_COMMENT, "");
                 talloc_free(scfg);
                 j++;

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

@@ -30 +30 @@
 #include "../librpc/gen_ndr/rap.h"
 #include "ntvfs/ipc/proto.h"
-#include "libcli/raw/ioctl.h"
+#include "../libcli/smb/smb_constants.h"
 #include "param/param.h"
 #include "../lib/tsocket/tsocket.h"
@@ -39 +39 @@
 #include "auth/credentials/credentials.h"
 #include "auth/credentials/credentials_krb5.h"
-#include <gssapi/gssapi.h>
+#include "system/kerberos.h"
+#include "system/gssapi.h"
 #include "system/locale.h"
+#include "system/filesys.h"
 
 /* this is the private structure used to keep the state of an open
@@ -259 +261 @@
         case RAW_OPEN_NTTRANS_CREATE:
                 fname = oi->ntcreatex.in.fname;
+                while (fname[0] == '\\') fname++;
                 break;
         case RAW_OPEN_OPENX:
                 fname = oi->openx.in.fname;
+                while (fname[0] == '\\') fname++;
+                if (strncasecmp(fname, "PIPE\\", 5) != 0) {
+                        return NT_STATUS_OBJECT_PATH_SYNTAX_BAD;
+                }
+                while (fname[0] == '\\') fname++;
                 break;
         case RAW_OPEN_SMB2:
@@ -282 +290 @@
         p = talloc(h, struct pipe_state);
         NT_STATUS_HAVE_NO_MEMORY(p);
-
-        while (fname[0] == '\\') fname++;
 
         /* check for valid characters in name */
@@ -354 +360 @@
         TALLOC_FREE(subreq);
         if (ret == -1) {
-                status = map_nt_error_from_unix(sys_errno);
+                status = map_nt_error_from_unix_common(sys_errno);
                 goto reply;
         }
@@ -603 +609 @@
         TALLOC_FREE(subreq);
         if (ret == -1) {
-                status = map_nt_error_from_unix(sys_errno);
+                status = map_nt_error_from_unix_common(sys_errno);
                 goto reply;
         }
@@ -688 +694 @@
         TALLOC_FREE(subreq);
         if (ret == -1) {
-                status = map_nt_error_from_unix(sys_errno);
+                status = map_nt_error_from_unix_common(sys_errno);
                 goto reply;
         }
@@ -732 +738 @@
         struct pipe_state *p;
 
-        if (io->generic.level != RAW_CLOSE_CLOSE) {
+        if (io->generic.level != RAW_CLOSE_GENERIC) {
                 return ntvfs_map_close(ntvfs, req, io);
         }
 
-        p = pipe_state_find(ipriv, io->close.in.file.ntvfs);
+        ZERO_STRUCT(io->generic.out);
+
+        p = pipe_state_find(ipriv, io->generic.in.file.ntvfs);
         if (!p) {
                 return NT_STATUS_INVALID_HANDLE;
@@ -1010 +1018 @@
                 goto reply;
         } else if (ret == -1) {
-                status = map_nt_error_from_unix(sys_errno);
+                status = map_nt_error_from_unix_common(sys_errno);
                 goto reply;
         }
@@ -1046 +1054 @@
         TALLOC_FREE(subreq);
         if (ret == -1) {
-                status = map_nt_error_from_unix(sys_errno);
+                status = map_nt_error_from_unix_common(sys_errno);
                 goto reply;
         }
@@ -1174 +1182 @@
         io->smb2.out.unknown2   = 0;
         io->smb2.out.unknown3   = 0;
-        io->smb2.out.in         = io->smb2.in.out;
+        io->smb2.out.in         = data_blob_null;
         io->smb2.out.out = data_blob_talloc(req, NULL, io->smb2.in.max_response_size);
         NT_STATUS_HAVE_NO_MEMORY(io->smb2.out.out.data);
@@ -1216 +1224 @@
         TALLOC_FREE(subreq);
         if (ret == -1) {
-                status = map_nt_error_from_unix(sys_errno);
+                status = map_nt_error_from_unix_common(sys_errno);
                 goto reply;
         }
@@ -1252 +1260 @@
         TALLOC_FREE(subreq);
         if (ret == -1) {
-                status = map_nt_error_from_unix(sys_errno);
+                status = map_nt_error_from_unix_common(sys_errno);
                 goto reply;
         }
@@ -1303 +1311 @@
 
         /* fill in all the operations */
-        ops.connect = ipc_connect;
-        ops.disconnect = ipc_disconnect;
-        ops.unlink = ipc_unlink;
-        ops.chkpath = ipc_chkpath;
-        ops.qpathinfo = ipc_qpathinfo;
-        ops.setpathinfo = ipc_setpathinfo;
-        ops.open = ipc_open;
-        ops.mkdir = ipc_mkdir;
-        ops.rmdir = ipc_rmdir;
-        ops.rename = ipc_rename;
-        ops.copy = ipc_copy;
-        ops.ioctl = ipc_ioctl;
-        ops.read = ipc_read;
-        ops.write = ipc_write;
-        ops.seek = ipc_seek;
-        ops.flush = ipc_flush;  
-        ops.close = ipc_close;
-        ops.exit = ipc_exit;
-        ops.lock = ipc_lock;
-        ops.setfileinfo = ipc_setfileinfo;
-        ops.qfileinfo = ipc_qfileinfo;
-        ops.fsinfo = ipc_fsinfo;
-        ops.lpq = ipc_lpq;
-        ops.search_first = ipc_search_first;
-        ops.search_next = ipc_search_next;
-        ops.search_close = ipc_search_close;
-        ops.trans = ipc_trans;
-        ops.logoff = ipc_logoff;
-        ops.async_setup = ipc_async_setup;
-        ops.cancel = ipc_cancel;
+        ops.connect_fn = ipc_connect;
+        ops.disconnect_fn = ipc_disconnect;
+        ops.unlink_fn = ipc_unlink;
+        ops.chkpath_fn = ipc_chkpath;
+        ops.qpathinfo_fn = ipc_qpathinfo;
+        ops.setpathinfo_fn = ipc_setpathinfo;
+        ops.open_fn = ipc_open;
+        ops.mkdir_fn = ipc_mkdir;
+        ops.rmdir_fn = ipc_rmdir;
+        ops.rename_fn = ipc_rename;
+        ops.copy_fn = ipc_copy;
+        ops.ioctl_fn = ipc_ioctl;
+        ops.read_fn = ipc_read;
+        ops.write_fn = ipc_write;
+        ops.seek_fn = ipc_seek;
+        ops.flush_fn = ipc_flush;
+        ops.close_fn = ipc_close;
+        ops.exit_fn = ipc_exit;
+        ops.lock_fn = ipc_lock;
+        ops.setfileinfo_fn = ipc_setfileinfo;
+        ops.qfileinfo_fn = ipc_qfileinfo;
+        ops.fsinfo_fn = ipc_fsinfo;
+        ops.lpq_fn = ipc_lpq;
+        ops.search_first_fn = ipc_search_first;
+        ops.search_next_fn = ipc_search_next;
+        ops.search_close_fn = ipc_search_close;
+        ops.trans_fn = ipc_trans;
+        ops.logoff_fn = ipc_logoff;
+        ops.async_setup_fn = ipc_async_setup;
+        ops.cancel_fn = ipc_cancel;
 
         /* register ourselves with the NTVFS subsystem. */