Changeset 862 for trunk/server/source3/smbd/reply.c

Timestamp:

May 13, 2014, 11:39:04 AM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/smbd/reply.c (modified) (16 diffs)

trunk/server/source3/smbd/reply.c

@@ -1749 +1749 @@
         }
 
+
+
+
+
+
+
+
+
         status = filename_convert(ctx,
                                 conn,
                                 req->flags2 & FLAGS2_DFS_PATHNAMES,
                                 fname,
-                                0,
+                                (create_disposition == FILE_CREATE)
+                                        ? UCF_CREATING_FILE : 0,
                                 NULL,
                                 &smb_fname);
@@ -1764 +1773 @@
                 }
                 reply_nterror(req, status);
-                goto out;
-        }
-
-        if (!map_open_params_to_ntcreate(smb_fname->base_name, deny_mode,
-                                         OPENX_FILE_EXISTS_OPEN, &access_mask,
-                                         &share_mode, &create_disposition,
-                                         &create_options, &private_flags)) {
-                reply_force_doserror(req, ERRDOS, ERRbadaccess);
                 goto out;
         }
@@ -1924 +1925 @@
         }
 
+
+
+
+
+
+
+
+
+
+
         status = filename_convert(ctx,
                                 conn,
                                 req->flags2 & FLAGS2_DFS_PATHNAMES,
                                 fname,
-                                0,
+                                (create_disposition == FILE_CREATE)
+                                        ? UCF_CREATING_FILE : 0,
                                 NULL,
                                 &smb_fname);
@@ -1939 +1951 @@
                 }
                 reply_nterror(req, status);
-                goto out;
-        }
-
-        if (!map_open_params_to_ntcreate(smb_fname->base_name, deny_mode,
-                                         smb_ofun,
-                                         &access_mask, &share_mode,
-                                         &create_disposition,
-                                         &create_options,
-                                         &private_flags)) {
-                reply_force_doserror(req, ERRDOS, ERRbadaccess);
                 goto out;
         }
@@ -2146 +2148 @@
                                 req->flags2 & FLAGS2_DFS_PATHNAMES,
                                 fname,
-                                0,
+                                ,
                                 NULL,
                                 &smb_fname);
@@ -2240 +2242 @@
         connection_struct *conn = req->conn;
         struct smb_filename *smb_fname = NULL;
+
         char *fname = NULL;
         uint32 fattr;
         files_struct *fsp;
         int oplock_request;
-        int tmpfd;
         char *s;
         NTSTATUS status;
+
         TALLOC_CTX *ctx = talloc_tos();
 
@@ -2259 +2262 @@
         oplock_request = CORE_OPLOCK_REQUEST(req->inbuf);
 
-        srvstr_get_path_req(ctx, req, &fname, (const char *)req->buf+1,
+        srvstr_get_path_req(ctx, req, &name, (const char *)req->buf+1,
                             STR_TERMINATE, &status);
         if (!NT_STATUS_IS_OK(status)) {
@@ -2265 +2268 @@
                 goto out;
         }
-        if (*fname) {
-                fname = talloc_asprintf(ctx,
-                                "%s/TMXXXXXX",
-                                fname);
-        } else {
-                fname = talloc_strdup(ctx, "TMXXXXXX");
-        }
-
-        if (!fname) {
-                reply_nterror(req, NT_STATUS_NO_MEMORY);
-                goto out;
-        }
-
-        status = filename_convert(ctx, conn,
+
+        for (i = 0; i < 10; i++) {
+                if (*wire_name) {
+                        fname = talloc_asprintf(ctx,
+                                        "%s/TMP%s",
+                                        wire_name,
+                                        generate_random_str_list(ctx, 5, "0123456789"));
+                } else {
+                        fname = talloc_asprintf(ctx,
+                                        "TMP%s",
+                                        generate_random_str_list(ctx, 5, "0123456789"));
+                }
+
+                if (!fname) {
+                        reply_nterror(req, NT_STATUS_NO_MEMORY);
+                        goto out;
+                }
+
+                status = filename_convert(ctx, conn,
                                 req->flags2 & FLAGS2_DFS_PATHNAMES,
                                 fname,
-                                0,
+                                ,
                                 NULL,
                                 &smb_fname);
-        if (!NT_STATUS_IS_OK(status)) {
-                if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
-                        reply_botherror(req, NT_STATUS_PATH_NOT_COVERED,
+        if (!NT_STATUS_IS_OK(status)) {
+                if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
+                        reply_botherror(req, NT_STATUS_PATH_NOT_COVERED,
                                         ERRSRV, ERRbadpath);
+
+
+
                         goto out;
                 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                 reply_nterror(req, status);
-                goto out;
-        }
-
-        tmpfd = mkstemp(smb_fname->base_name);
-        if (tmpfd == -1) {
-                reply_nterror(req, map_nt_error_from_unix(errno));
-                goto out;
-        }
-
-        SMB_VFS_STAT(conn, smb_fname);
-
-        /* We should fail if file does not exist. */
-        status = SMB_VFS_CREATE_FILE(
-                conn,                                   /* conn */
-                req,                                    /* req */
-                0,                                      /* root_dir_fid */
-                smb_fname,                              /* fname */
-                FILE_GENERIC_READ | FILE_GENERIC_WRITE, /* access_mask */
-                FILE_SHARE_READ | FILE_SHARE_WRITE,     /* share_access */
-                FILE_OPEN,                              /* create_disposition*/
-                0,                                      /* create_options */
-                fattr,                                  /* file_attributes */
-                oplock_request,                         /* oplock_request */
-                0,                                      /* allocation_size */
-                0,                                      /* private_flags */
-                NULL,                                   /* sd */
-                NULL,                                   /* ea_list */
-                &fsp,                                   /* result */
-                NULL);                                  /* pinfo */
-
-        /* close fd from mkstemp() */
-        close(tmpfd);
-
-        if (!NT_STATUS_IS_OK(status)) {
-                if (open_was_deferred(req->mid)) {
-                        /* We have re-scheduled this call. */
-                        goto out;
-                }
-                reply_openerror(req, status);
                 goto out;
         }
@@ -2370 +2382 @@
  out:
         TALLOC_FREE(smb_fname);
+
+
         END_PROFILE(SMBctemp);
         return;
@@ -3137 +3151 @@
         START_PROFILE(SMBreadbraw);
 
-        if (srv_is_signing_active(sconn) ||
-            is_encrypted_packet(req->inbuf)) {
+        if (srv_is_signing_active(sconn) || req->encrypted) {
                 exit_server_cleanly("reply_readbraw: SMB signing/sealing is active - "
                         "raw reads/writes are disallowed.");
@@ -3531 +3544 @@
         int saved_errno = 0;
 
-        if(fsp_stat(fsp) == -1) {
-                reply_nterror(req, map_nt_error_from_unix(errno));
-                return;
-        }
-
         init_strict_lock_struct(fsp, (uint64_t)req->smbpid,
             (uint64_t)startpos, (uint64_t)smb_maxcnt, READ_LOCK,
@@ -3543 +3551 @@
                 reply_nterror(req, NT_STATUS_FILE_LOCK_CONFLICT);
                 return;
-        }
-
-        if (!S_ISREG(fsp->fsp_name->st.st_ex_mode) ||
-                        (startpos > fsp->fsp_name->st.st_ex_size)
-                        || (smb_maxcnt > (fsp->fsp_name->st.st_ex_size - startpos))) {
-                /*
-                 * We already know that we would do a short read, so don't
-                 * try the sendfile() path.
-                 */
-                goto nosendfile_read;
         }
 
@@ -3562 +3560 @@
 
         if (!req_is_in_chain(req) &&
-            !is_encrypted_packet(req->inbuf) && (fsp->base_fsp == NULL) &&
+            ! && (fsp->base_fsp == NULL) &&
             (fsp->wcp == NULL) &&
             lp_use_sendfile(SNUM(conn), req->sconn->smb1.signing_state) ) {
                 uint8 headerbuf[smb_size + 12 * 2];
                 DATA_BLOB header;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
                 /*
@@ -3766 +3779 @@
                         }
                         /* We currently don't do this on signed or sealed data. */
-                        if (srv_is_signing_active(req->sconn) ||
-                            is_encrypted_packet(req->inbuf)) {
+                        if (srv_is_signing_active(req->sconn) || req->encrypted) {
                                 reply_nterror(req, NT_STATUS_NOT_SUPPORTED);
                                 END_PROFILE(SMBreadX);
@@ -5530 +5542 @@
                                  req->flags2 & FLAGS2_DFS_PATHNAMES,
                                  directory,
-                                 0,
+                                 ,
                                  NULL,
                                  &smb_dname);
@@ -6195 +6207 @@
                           smb_fname_str_dbg(smb_fname_dst)));
 
-                if (!lp_posix_pathnames() &&
+                if (!fsp->is_directory &&
+                    !lp_posix_pathnames() &&
                     (lp_map_archive(SNUM(conn)) ||
                     lp_store_dos_attributes(SNUM(conn)))) {