s3-spoolss: use SPOOLSS_PRINTER_CONTROL flags defined in IDL.

Guenther

diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index a3f9a9e4b7809b921aab54cb60a37ca52e09f602..76f72f05aae51e4b016d22e799f6a0885174a94f 100644 (file)
--- 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 204078d5c34a944b158daf5083ebca4b5731faa5..5c4ff61b17a8139c511a7d607b4c801d6969b60c 100644 (file)
--- 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;
                }