Changeset 745 for trunk/server/source3/smbd/smb2_setinfo.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/smbd/smb2_setinfo.c (modified) (8 diffs)

trunk/server/source3/smbd/smb2_setinfo.c

@@ -4 +4 @@
 
    Copyright (C) Stefan Metzmacher 2009
+   Copyright (C) Jeremy Allison 2010
 
    This program is free software; you can redistribute it and/or modify
@@ -20 +21 @@
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
+#include "trans2.h"
+#include "../lib/util/tevent_ntstatus.h"
 
 static struct tevent_req *smbd_smb2_setinfo_send(TALLOC_CTX *mem_ctx,
@@ -88 +92 @@
         if (req->compat_chain_fsp) {
                 /* skip check */
-        } else if (in_file_id_persistent != 0) {
+        } else if (in_file_id_persistent != in_file_id_volatile) {
                 return smbd_smb2_request_error(req, NT_STATUS_FILE_CLOSED);
         }
@@ -162 +166 @@
                                                  uint64_t in_file_id_volatile)
 {
-        struct tevent_req *req;
-        struct smbd_smb2_setinfo_state *state;
-        struct smb_request *smbreq;
+        struct tevent_req *req = NULL;
+        struct smbd_smb2_setinfo_state *state = NULL;
+        struct smb_request *smbreq = NULL;
         connection_struct *conn = smb2req->tcon->compat_conn;
-        files_struct *fsp;
+        files_struct *fsp = NULL;
+        NTSTATUS status;
 
         req = tevent_req_create(mem_ctx, &state,
@@ -209 +214 @@
                 int data_size;
                 int ret_size = 0;
-                NTSTATUS status;
 
 
                 file_info_level = in_file_info_class + 1000;
                 if (file_info_level == SMB_FILE_RENAME_INFORMATION) {
-                        file_info_level = 0xFF00 + in_file_info_class;
-                }
-
-                if (fsp->is_directory || fsp->fh->fd == -1) {
+                        /* SMB2_FILE_RENAME_INFORMATION_INTERNAL == 0xFF00 + in_file_info_class */
+                        file_info_level = SMB2_FILE_RENAME_INFORMATION_INTERNAL;
+                        if (fsp->oplock_type != FAKE_LEVEL_II_OPLOCK &&
+                            fsp->oplock_type != NO_OPLOCK) {
+                                /* No break, but error. */
+                                tevent_req_nterror(req, NT_STATUS_SHARING_VIOLATION);
+                                return tevent_req_post(req, ev);
+                        }
+                }
+
+                if (fsp->fh->fd == -1) {
                         /*
                          * This is actually a SETFILEINFO on a directory
@@ -252 +263 @@
                             && in_input_buffer.length >= 1
                             && CVAL(in_input_buffer.data,0)) {
-                                fsp->fh->private_options |= FILE_DELETE_ON_CLOSE;
+                                fsp->fh->private_options |= NTCREATEX_OPTIONS_PRIVATE_DELETE_ON_CLOSE;
 
                                 DEBUG(3,("smbd_smb2_setinfo_send: "
@@ -285 +296 @@
                         data = (char *)SMB_MALLOC_ARRAY(char, data_size);
                         if (tevent_req_nomem(data, req)) {
-
+                                return tevent_req_post(req, ev);
                         }
                         memcpy(data, in_input_buffer.data, data_size);
@@ -308 +319 @@
         }
 
+        case 0x03:/* SMB2_SETINFO_SECURITY */
+        {
+                if (!CAN_WRITE(conn)) {
+                        tevent_req_nterror(req, NT_STATUS_ACCESS_DENIED);
+                        return tevent_req_post(req, ev);
+                }
+
+                status = set_sd(fsp,
+                                in_input_buffer.data,
+                                in_input_buffer.length,
+                                in_additional_information);
+                if (!NT_STATUS_IS_OK(status)) {
+                        tevent_req_nterror(req, status);
+                        return tevent_req_post(req, ev);
+                }
+                break;
+        }
+
         default:
                 tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);