From 2a311b1ea7ef2de6adb1567c9afc8127ed8e3978 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 11 Feb 2009 15:26:00 +0100 Subject: s3-spoolss: use SPOOLSS_PRINTER_CONTROL flags defined in IDL. Guenther --- source3/include/rpc_spoolss.h | 6 ------ source3/rpc_server/srv_spoolss_nt.c | 8 ++++---- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h index a3f9a9e4b7..76f72f05aa 100644 --- a/source3/include/rpc_spoolss.h +++ b/source3/include/rpc_spoolss.h @@ -122,12 +122,6 @@ #define SPL_XCV_MONITOR_TCPMON ",XcvMonitor Standard TCP/IP Port" -#define PRINTER_CONTROL_UNPAUSE 0x00000000 -#define PRINTER_CONTROL_PAUSE 0x00000001 -#define PRINTER_CONTROL_RESUME 0x00000002 -#define PRINTER_CONTROL_PURGE 0x00000003 -#define PRINTER_CONTROL_SET_STATUS 0x00000004 - #define PRINTER_STATUS_OK 0x00000000 #define JOB_ACCESS_READ 0x00000020 diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index 204078d5c3..5c4ff61b17 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -5925,18 +5925,18 @@ static WERROR control_printer(POLICY_HND *handle, uint32 command, return WERR_BADFID; switch (command) { - case PRINTER_CONTROL_PAUSE: + case SPOOLSS_PRINTER_CONTROL_PAUSE: if (print_queue_pause(p->server_info, snum, &errcode)) { errcode = WERR_OK; } break; - case PRINTER_CONTROL_RESUME: - case PRINTER_CONTROL_UNPAUSE: + case SPOOLSS_PRINTER_CONTROL_RESUME: + case SPOOLSS_PRINTER_CONTROL_UNPAUSE: if (print_queue_resume(p->server_info, snum, &errcode)) { errcode = WERR_OK; } break; - case PRINTER_CONTROL_PURGE: + case SPOOLSS_PRINTER_CONTROL_PURGE: if (print_queue_purge(p->server_info, snum, &errcode)) { errcode = WERR_OK; } -- cgit