Changeset 740 for vendor/current/source3/smbd/fileio.c

Timestamp:

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

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/smbd/fileio.c (modified) (6 diffs)

vendor/current/source3/smbd/fileio.c

@@ -21 +21 @@
 
 #include "includes.h"
+
+
 #include "smbd/globals.h"
+
 
 static bool setup_write_cache(files_struct *, SMB_OFF_T);
@@ -128 +131 @@
         } else {
                 fsp->fh->pos = pos;
-                if (pos && lp_strict_allocate(SNUM(fsp->conn))) {
+                if (pos && lp_strict_allocate(SNUM(fsp->conn) &&
+                                !fsp->is_sparse)) {
                         if (vfs_fill_sparse(fsp, pos) == -1) {
                                 return -1;
@@ -292 +296 @@
 
         if (fsp->print_file) {
-                uint32 jobid;
-
-                if (!rap_to_pjobid(fsp->rap_print_jobid, NULL, &jobid)) {
-                        DEBUG(3,("write_file: Unable to map RAP jobid %u to jobid.\n",
-                                                (unsigned int)fsp->rap_print_jobid ));
-                        errno = EBADF;
+                uint32;
+                int ret;
+
+                
+                
+                        errno = ;
                         return -1;
                 }
-
-                return print_job_write(SNUM(fsp->conn), jobid, data, pos, n);
+                return t;
         }
 
@@ -320 +323 @@
                                 if (!IS_DOS_ARCHIVE(dosmode)) {
                                         file_set_dosmode(fsp->conn, fsp->fsp_name,
-                                                 dosmode | aARCH, NULL, false);
+                                                 dosmode | , NULL, false);
                                 }
                         }
@@ -403 +406 @@
         fsp->fh->pos = pos + n;
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         /*
          * If we have active cache and it isn't contiguous then we flush.
@@ -794 +828 @@
                 }
 #endif
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                 memcpy(wcp->data+wcp->data_size, data, n);
                 if (wcp->data_size == 0) {