Changeset 751 for trunk/server/source3/include/printing.h

Timestamp:

Nov 29, 2012, 1:59:04 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9

File:

• trunk/server/source3/include/printing.h (modified) (7 diffs)

trunk/server/source3/include/printing.h

@@ -47 +47 @@
 
 typedef struct _print_queue_struct {
-        int job;                /* normally the UNIX jobid -- see note in
+        int sysjob;             /* normally the UNIX jobid -- see note in
                                    printing.c:traverse_fn_delete() */
         int size;
@@ -69 +69 @@
 struct printjob {
         pid_t pid; /* which process launched the job */
+        uint32_t jobid; /* the spoolss print job identifier */
         int sysjob; /* the system (lp) job number */
         int fd; /* file descriptor of open file if open */
@@ -101 +102 @@
   int (*job_pause)(int snum, struct printjob *pjob);
   int (*job_resume)(int snum, struct printjob *pjob);
-  int (*job_submit)(int snum, struct printjob *pjob);
+  int (*job_submit)(int snum, struct printjob *pjob,
+                    enum printing_types printing_type,
+                    char *lpq_command);
 };
 
@@ -124 +127 @@
 #define PRINT_SPOOL_PREFIX "smbprn."
 #endif
-#define PRINT_DATABASE_VERSION 7
+#define PRINT_DATABASE_VERSION 8
 
 #ifdef AIX
@@ -195 +198 @@
 bool print_notify_deregister_pid(int snum);
 bool print_job_exists(const char* sharename, uint32 jobid);
-char *print_job_fname(const char* sharename, uint32 jobid);
-struct spoolss_DeviceMode *print_job_devmode(const char* sharename, uint32 jobid);
+struct spoolss_DeviceMode *print_job_devmode(TALLOC_CTX *mem_ctx,
+                                             const char *sharename,
+                                             uint32 jobid);
 bool print_job_set_name(struct tevent_context *ev,
                         struct messaging_context *msg_ctx,
@@ -204 +208 @@
                         struct messaging_context *msg_ctx,
                         int snum, uint32_t jobid);
-bool print_job_pause(const struct auth_serversupplied_info *server_info,
+WERROR print_job_pause(const struct auth_serversupplied_info *server_info,
                      struct messaging_context *msg_ctx,
-                     int snum, uint32 jobid, WERROR *errcode);
-bool print_job_resume(const struct auth_serversupplied_info *server_info,
+                     int snum, uint32 jobid);
+WERROR print_job_resume(const struct auth_serversupplied_info *server_info,
                       struct messaging_context *msg_ctx,
-                      int snum, uint32 jobid, WERROR *errcode);
+                      int snum, uint32 jobid);
 ssize_t print_job_write(struct tevent_context *ev,
                         struct messaging_context *msg_ctx,
@@ -246 +250 @@
                      print_queue_struct *buf,
                      print_status_struct *status,bool first);
-uint32_t print_parse_jobid(const char *fname);
 
 /* The following definitions come from printing/printing_db.c  */