Changeset 232 for branches/samba-3.2.x/source/printing

Timestamp:

May 27, 2009, 9:09:42 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.8

Location:

branches/samba-3.2.x/source/printing

Files:

• print_cups.c (modified) (2 diffs)
• printfsp.c (modified) (2 diffs)
• printing.c (modified) (1 diff)

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

@@ -389 +389 @@
 
         /* Child. */
-        if (!reinit_after_fork(smbd_messaging_context(), true)) {
+        close_all_print_db();
+
+        if (!reinit_after_fork(smbd_messaging_context(),
+                        smbd_event_context(), true)) {
                 DEBUG(0,("cups_pcap_load_async: reinit_after_fork() failed\n"));
                 smb_panic("cups_pcap_load_async: reinit_after_fork() failed");
@@ -1711 +1714 @@
                 ippDelete(response);
 
+        if (request) {
+                ippDelete(request);
+        }
+
         if (language)
                 cupsLangFree(language);

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

@@ -29 +29 @@
 
 NTSTATUS print_fsp_open(connection_struct *conn, const char *fname,
-                        files_struct *fsp)
+                        files_struct *fsp, SMB_STRUCT_STAT *psbuf)
 {
         int jobid;
-        SMB_STRUCT_STAT sbuf;
         fstring name;
         NTSTATUS status;
@@ -76 +75 @@
         string_set(&fsp->fsp_name,print_job_fname(lp_const_servicename(SNUM(conn)),jobid));
         fsp->wcp = NULL;
-        SMB_VFS_FSTAT(fsp, &sbuf);
-        fsp->mode = sbuf.st_mode;
-        fsp->file_id = vfs_file_id_from_sbuf(conn, &sbuf);
+        SMB_VFS_FSTAT(fsp, psbuf);
+        fsp->mode = psbuf->st_mode;
+        fsp->file_id = vfs_file_id_from_sbuf(conn, psbuf);
 
         return NT_STATUS_OK;

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

@@ -1422 +1422 @@
                 pause_pipe[0] = -1;
 
-                if (!reinit_after_fork(smbd_messaging_context(), true)) {
+                if (!reinit_after_fork(smbd_messaging_context(),
+                                       smbd_event_context(), true)) {
                         DEBUG(0,("reinit_after_fork() failed\n"));
                         smb_panic("reinit_after_fork() failed");