Changeset 228 for branches/samba-3.2.x/source/printing/printfsp.c

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

File:

• branches/samba-3.2.x/source/printing/printfsp.c (modified) (4 diffs)

branches/samba-3.2.x/source/printing/printfsp.c

@@ -29 +29 @@
 
 NTSTATUS print_fsp_open(connection_struct *conn, const char *fname,
-                        files_struct **result)
+                        files_struct *fsp)
 {
         int jobid;
         SMB_STRUCT_STAT sbuf;
-        files_struct *fsp;
         fstring name;
         NTSTATUS status;
-
-        status = file_new(conn, &fsp);
-        if(!NT_STATUS_IS_OK(status)) {
-                return status;
-        }
 
         fstrcpy( name, "Remote Downlevel Document");
@@ -55 +49 @@
         if (jobid == -1) {
                 status = map_nt_error_from_unix(errno);
-                file_free(fsp);
                 return status;
         }
@@ -64 +57 @@
                 /* We need to delete the entry in the tdb. */
                 pjob_delete(lp_const_servicename(SNUM(conn)), jobid);
-                file_free(fsp);
                 return NT_STATUS_ACCESS_DENIED; /* No errno around here */
         }
@@ -83 +75 @@
         fsp->is_directory = False;
         string_set(&fsp->fsp_name,print_job_fname(lp_const_servicename(SNUM(conn)),jobid));
-        fsp->wcp = NULL; 
+        fsp->wcp = NULL;
         SMB_VFS_FSTAT(fsp, &sbuf);
         fsp->mode = sbuf.st_mode;
         fsp->file_id = vfs_file_id_from_sbuf(conn, &sbuf);
 
-        conn->num_files_open++;
-
-        *result = fsp;
         return NT_STATUS_OK;
 }