diff options
| -rw-r--r-- | source3/include/printing.h | 40 | ||||
| -rw-r--r-- | source3/include/smb.h | 40 | ||||
| -rw-r--r-- | source3/printing/tests/vlp.c | 1 |
3 files changed, 41 insertions, 40 deletions
diff --git a/source3/include/printing.h b/source3/include/printing.h index 0316eb58c9..72c9cef7c0 100644 --- a/source3/include/printing.h +++ b/source3/include/printing.h @@ -25,6 +25,46 @@ SAMBA printing subsystem. */ +/* Extra fields above "LPQ_PRINTING" are used to map extra NT status codes. */ + +enum { + LPQ_QUEUED = 0, + LPQ_PAUSED, + LPQ_SPOOLING, + LPQ_PRINTING, + LPQ_ERROR, + LPQ_DELETING, + LPQ_OFFLINE, + LPQ_PAPEROUT, + LPQ_PRINTED, + LPQ_DELETED, + LPQ_BLOCKED, + LPQ_USER_INTERVENTION, + + /* smbd is dooing the file spooling before passing control to spoolss */ + PJOB_SMBD_SPOOLING +}; + +typedef struct _print_queue_struct { + int job; /* normally the UNIX jobid -- see note in + printing.c:traverse_fn_delete() */ + int size; + int page_count; + int status; + int priority; + time_t time; + fstring fs_user; + fstring fs_file; +} print_queue_struct; + +enum {LPSTAT_OK, LPSTAT_STOPPED, LPSTAT_ERROR}; + +typedef struct { + fstring message; + int qcount; + int status; +} print_status_struct; + /* Information for print jobs */ struct printjob { pid_t pid; /* which process launched the job */ diff --git a/source3/include/smb.h b/source3/include/smb.h index 0776ed9656..d3fa3f2790 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -591,46 +591,6 @@ typedef struct { fstring domain; /* domain that the client specified */ } userdom_struct; -/* Extra fields above "LPQ_PRINTING" are used to map extra NT status codes. */ - -enum { - LPQ_QUEUED = 0, - LPQ_PAUSED, - LPQ_SPOOLING, - LPQ_PRINTING, - LPQ_ERROR, - LPQ_DELETING, - LPQ_OFFLINE, - LPQ_PAPEROUT, - LPQ_PRINTED, - LPQ_DELETED, - LPQ_BLOCKED, - LPQ_USER_INTERVENTION, - - /* smbd is dooing the file spooling before passing control to spoolss */ - PJOB_SMBD_SPOOLING -}; - -typedef struct _print_queue_struct { - int job; /* normally the UNIX jobid -- see note in - printing.c:traverse_fn_delete() */ - int size; - int page_count; - int status; - int priority; - time_t time; - fstring fs_user; - fstring fs_file; -} print_queue_struct; - -enum {LPSTAT_OK, LPSTAT_STOPPED, LPSTAT_ERROR}; - -typedef struct { - fstring message; - int qcount; - int status; -} print_status_struct; - /* used for server information: client, nameserv and ipc */ struct server_info_struct { fstring name; diff --git a/source3/printing/tests/vlp.c b/source3/printing/tests/vlp.c index 48b71204d8..494a811f01 100644 --- a/source3/printing/tests/vlp.c +++ b/source3/printing/tests/vlp.c @@ -20,6 +20,7 @@ */ #include "includes.h" +#include "printing.h" #ifdef malloc #undef malloc |