Changeset 745 for trunk/server/source3/modules/onefs_open.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/modules/onefs_open.c (modified) (28 diffs)

trunk/server/source3/modules/onefs_open.c

@@ -34 +34 @@
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "onefs.h"
 #include "onefs_config.h"
@@ -55 +56 @@
                               uint32_t oplock_request,
                               uint64_t allocation_size,
+                              uint32_t private_flags,
                               struct security_descriptor *sd,
                               struct ea_list *ea_list,
@@ -313 +315 @@
                         True : False;
         }
-        fsp->print_file = False;
+        fsp->print_file = NULL;
         fsp->modified = False;
         fsp->sent_oplock_break = NO_BREAK_SENT;
@@ -326 +328 @@
 
         DEBUG(2,("%s opened file %s read=%s write=%s (numopen=%d)\n",
-                 conn->server_info->unix_name,
+                 conn->session_info->unix_name,
                  smb_fname_str_dbg(smb_fname),
                  BOOLSTR(fsp->can_read), BOOLSTR(fsp->can_write),
@@ -358 +360 @@
                 if (procid_is_me(&e->pid) && (e->op_mid == req->mid)) {
                         DEBUG(0, ("Trying to defer an already deferred "
-                                  "request: mid=%d, exiting\n", req->mid));
+                                "request: mid=%llu, exiting\n",
+                                (unsigned long long)req->mid));
                         exit_server("attempt to defer a deferred request");
                 }
@@ -366 +369 @@
 
         DEBUG(10,("defer_open_sharing_error: time [%u.%06u] adding deferred "
-                  "open entry for mid %u\n",
+                  "open entry for mid %llu\n",
                   (unsigned int)request_time.tv_sec,
                   (unsigned int)request_time.tv_usec,
-                  (unsigned int)req->mid));
-
-        if (!push_deferred_smb_message(req, request_time, timeout,
-                                       (char *)state, sizeof(*state))) {
-                exit_server("push_deferred_smb_message failed");
+                  (unsigned long long)req->mid));
+
+        if (!push_deferred_open_message_smb(req, request_time, timeout,
+                                       state->id, (char *)state, sizeof(*state))) {
+                exit_server("push_deferred_open_message_smb failed");
         }
         add_deferred_open(lck, req->mid, request_time, state->id);
@@ -439 +442 @@
                                   uint32 new_dos_attributes,
                                   int oplock_request,
+                                  uint32_t private_flags,
                                   struct security_descriptor *sd,
                                   files_struct *fsp,
@@ -456 +460 @@
         int info;
         uint32 existing_dos_attributes = 0;
-        struct pending_message_list *pml = NULL;
         struct timeval request_time = timeval_zero();
         struct share_mode_lock *lck = NULL;
@@ -482 +485 @@
                            smb_fname_str_dbg(smb_fname)));
 
-                return print_fsp_open(req, conn, smb_fname->base_name,
-                                      req->vuid, fsp);
+                return print_spool_open(fsp, smb_fname->base_name,
+                                        req->vuid);
         }
 
@@ -496 +499 @@
                 new_dos_attributes = 0;
         } else {
-                /* We add aARCH to this as this mode is only used if the file is
+                /* We add FILE_ATTRIBUTE_ARCHIVE to this as this mode is only used if the file is
                  * created new. */
-                unx_mode = unix_mode(conn, new_dos_attributes | aARCH,
+                unx_mode = unix_mode(conn, new_dos_attributes | FILE_ATTRIBUTE_ARCHIVE,
                                      smb_fname, parent_dir);
         }
@@ -541 +544 @@
          */
 
-        if ((req != NULL)
-            && ((pml = get_open_deferred_message(req->mid)) != NULL)) {
-                struct deferred_open_record *state =
-                        (struct deferred_open_record *)pml->private_data.data;
-
-                /* Remember the absolute time of the original
-                   request with this mid. We'll use it later to
-                   see if this has timed out. */
-
-                request_time = pml->request_time;
-
-                /* Remove the deferred open entry under lock. */
-                lck = get_share_mode_lock(talloc_tos(), state->id, NULL, NULL,
-                                          NULL);
-                if (lck == NULL) {
-                        DEBUG(0, ("could not get share mode lock\n"));
-                } else {
-                        del_deferred_open_entry(lck, req->mid);
-                        TALLOC_FREE(lck);
-                }
-
-                /* Ensure we don't reprocess this message. */
-                remove_deferred_open_smb_message(req->mid);
-
-                /*
-                 * When receiving a semlock_async_failure message, the
-                 * deferred open will be marked as "failed". Returning
-                 * INTERNAL_ERROR.
-                 */
-                if (state->failed) {
-                        DEBUG(0, ("onefs_open_file_ntcreate: "
-                                  "semlock_async_failure detected!\n"));
-                        return NT_STATUS_INTERNAL_ERROR;
+        if (req) {
+                void *ptr;
+                if (get_deferred_open_message_state(req,
+                                &request_time,
+                                &ptr)) {
+                        struct deferred_open_record *state = (struct deferred_open_record *)ptr;
+
+                        /* Remember the absolute time of the original
+                           request with this mid. We'll use it later to
+                           see if this has timed out. */
+
+                        /* Remove the deferred open entry under lock. */
+                        remove_deferred_open_entry(state->id, req->mid);
+
+                        /* Ensure we don't reprocess this message. */
+                        remove_deferred_open_message_smb(req->mid);
+
+                        /*
+                         * When receiving a semlock_async_failure message, the
+                         * deferred open will be marked as "failed". Returning
+                         * INTERNAL_ERROR.
+                         */
+                        if (state->failed) {
+                                DEBUG(0, ("onefs_open_file_ntcreate: "
+                                          "semlock_async_failure detected!\n"));
+                                return NT_STATUS_INTERNAL_ERROR;
+                        }
                 }
         }
@@ -591 +588 @@
         /* Setup dos_attributes to be set by ifs_createfile */
         if (lp_store_dos_attributes(SNUM(conn))) {
-                createfile_attributes = (new_dos_attributes | aARCH) &
+                createfile_attributes = (new_dos_attributes | FILE_ATTRIBUTE_ARCHIVE) &
                     ~(FILE_ATTRIBUTE_NONINDEXED | FILE_ATTRIBUTE_COMPRESSED);
         }
 
         /* Ignore oplock requests if oplocks are disabled. */
-        if (!lp_oplocks(SNUM(conn)) || global_client_failed_oplock_break ||
+        if (!lp_oplocks(SNUM(conn)) ||
             IS_VETO_OPLOCK_PATH(conn, smb_fname->base_name)) {
                 /* Mask off everything except the private Samba bits. */
@@ -819 +816 @@
 
         fsp->share_access = share_access;
-        fsp->fh->private_options = create_options;
+        fsp->fh->private_options = private_flags;
         fsp->access_mask = open_access_mask; /* We change this to the
                                               * requested access_mask after
@@ -993 +990 @@
 
                         /* Try to find dup fsp if possible. */
-                        if (create_options &
+                        if (private_flags &
                             (NTCREATEX_OPTIONS_PRIVATE_DENY_DOS|
                              NTCREATEX_OPTIONS_PRIVATE_DENY_FCB)) {
@@ -1262 +1259 @@
          */
 
-        /* Record the options we were opened with. */
-        fsp->share_access = share_access;
-        fsp->fh->private_options = create_options;
         /*
          * According to Samba4, SEC_FILE_READ_ATTRIBUTE is always granted,
@@ -1317 +1311 @@
         }
 
-        set_share_mode(lck, fsp, conn->server_info->utok.uid, 0,
+        set_share_mode(lck, fsp, get_current_uid(conn),
+                        req ? req->mid : 0,
                        fsp->oplock_type);
 
@@ -1489 +1484 @@
                 file_attributes = 0;
         } else {
-                mode = unix_mode(conn, aDIR, smb_dname, parent_dir);
+                mode = unix_mode(conn, FILE_ATTRIBUTE_DIRECTORY, smb_dname, parent_dir);
         }
 
@@ -1630 +1625 @@
 
         fsp->share_access = share_access;
-        fsp->fh->private_options = create_options;
+        fsp->fh->private_options = 0;
         /*
          * According to Samba4, SEC_FILE_READ_ATTRIBUTE is always granted,
          */
         fsp->access_mask = access_mask | FILE_READ_ATTRIBUTES;
-        fsp->print_file = False;
+        fsp->print_file = NULL;
         fsp->modified = False;
         fsp->oplock_type = NO_OPLOCK;
@@ -1673 +1668 @@
         }
 
-        set_share_mode(lck, fsp, conn->server_info->utok.uid, 0, NO_OPLOCK);
+        set_share_mode(lck, fsp, get_current_uid(conn),
+                req ? req->mid : 0, NO_OPLOCK);
 
         /*
@@ -1719 +1715 @@
                                            uint32_t oplock_request,
                                            uint64_t allocation_size,
+                                           uint32_t private_flags,
                                            struct security_descriptor *sd,
                                            struct ea_list *ea_list,
@@ -1733 +1730 @@
                   "file_attributes = 0x%x, share_access = 0x%x, "
                   "create_disposition = 0x%x create_options = 0x%x "
-                  "oplock_request = 0x%x ea_list = 0x%p, sd = 0x%p, "
+                  "oplock_request = 0x%x private_flags = 0x%x "
+                  "ea_list = 0x%p, sd = 0x%p, "
                   "fname = %s\n",
                   (unsigned int)access_mask,
@@ -1741 +1739 @@
                   (unsigned int)create_options,
                   (unsigned int)oplock_request,
+                  (unsigned int)private_flags,
                   ea_list, sd, smb_fname_str_dbg(smb_fname)));
 
@@ -1824 +1823 @@
                         NO_OPLOCK,                      /* oplock_request */
                         0,                              /* allocation_size */
+                        0,                              /* private_flags */
                         NULL,                           /* sd */
                         NULL,                           /* ea_list */
@@ -2067 +2067 @@
                            uint32_t oplock_request,
                            uint64_t allocation_size,
+                           uint32_t private_flags,
                            struct security_descriptor *sd,
                            struct ea_list *ea_list,
@@ -2081 +2082 @@
                   "file_attributes = 0x%x, share_access = 0x%x, "
                   "create_disposition = 0x%x create_options = 0x%x "
-                  "oplock_request = 0x%x "
+                  "oplock_request = 0x%x private_flags = 0x%x"
                   "root_dir_fid = 0x%x, ea_list = 0x%p, sd = 0x%p, "
                   "fname = %s\n",
@@ -2090 +2091 @@
                   (unsigned int)create_options,
                   (unsigned int)oplock_request,
+                  (unsigned int)private_flags,
                   (unsigned int)root_dir_fid,
                   ea_list, sd, smb_fname_str_dbg(smb_fname)));
@@ -2108 +2110 @@
         if (!NT_STATUS_IS_OK(status)) {
                 goto fail;
+        }
+
+        if (is_ntfs_stream_smb_fname(smb_fname)) {
+                if (!(conn->fs_capabilities & FILE_NAMED_STREAMS)) {
+                        status = NT_STATUS_OBJECT_NAME_NOT_FOUND;
+                        goto fail;
+                }
+
+                if (is_ntfs_default_stream_smb_fname(smb_fname)) {
+                        int ret;
+                        smb_fname->stream_name = NULL;
+                        /* We have to handle this error here. */
+                        if (create_options & FILE_DIRECTORY_FILE) {
+                                status = NT_STATUS_NOT_A_DIRECTORY;
+                                goto fail;
+                        }
+                        if (lp_posix_pathnames()) {
+                                ret = SMB_VFS_LSTAT(conn, smb_fname);
+                        } else {
+                                ret = SMB_VFS_STAT(conn, smb_fname);
+                        }
+
+                        if (ret == 0 && VALID_STAT_OF_DIR(smb_fname->st)) {
+                                status = NT_STATUS_FILE_IS_A_DIRECTORY;
+                                goto fail;
+                        }
+                }
         }
 
@@ -2121 +2150 @@
                 oplock_request,                         /* oplock_request */
                 allocation_size,                        /* allocation_size */
+                private_flags,
                 sd,                                     /* sd */
                 ea_list,                                /* ea_list */