s3-spoolss: remove SPL Port definitions now in IDL.

Guenther

diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index a8e7f71dca156cf148fcc9af7d577995b6a4cd98..dc6c976cc8d5c9d6ab5ec0fe100df926ce58d627 100644 (file)
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -111,16 +111,6 @@
 #define SPOOLSS_XCVDATAPORT                            0x58
 #define SPOOLSS_ADDPRINTERDRIVEREX                     0x59
 
-/* 
- * Special strings for the OpenPrinter() call.  See the MSDN DDK
- * docs on the XcvDataPort() for more details.
- */
-
-#define SPL_LOCAL_PORT            "Local Port"
-#define SPL_TCPIP_PORT            "Standard TCP/IP Port"
-#define SPL_XCV_MONITOR_LOCALMON  ",XcvMonitor Local Port"
-#define SPL_XCV_MONITOR_TCPMON    ",XcvMonitor Standard TCP/IP Port"
-
 /* Notify field types */
 
 #define PRINTER_NOTIFY_TYPE 0x00

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 8e1d528c785bc019cb30363401db50f124f0a463..deccd4da80cdf2d7c71c34b8e3ef6f3fc8fd96b1 100644 (file)
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -6938,7 +6938,7 @@ static WERROR fill_port_2(TALLOC_CTX *mem_ctx,
        r->monitor_name = talloc_strdup(mem_ctx, "Local Monitor");
        W_ERROR_HAVE_NO_MEMORY(r->monitor_name);
 
-       r->description = talloc_strdup(mem_ctx, SPL_LOCAL_PORT); /* FIXME */
+       r->description = talloc_strdup(mem_ctx, SPL_LOCAL_PORT);
        W_ERROR_HAVE_NO_MEMORY(r->description);
 
        r->port_type = SPOOLSS_PORT_TYPE_WRITE;
@@ -8397,13 +8397,13 @@ static WERROR enumprintmonitors_level_1(TALLOC_CTX *mem_ctx,
        *count = 2;
 
        result = fill_monitor_1(info, &info[0].info1,
-                               SPL_LOCAL_PORT /* FIXME */);
+                               SPL_LOCAL_PORT);
        if (!W_ERROR_IS_OK(result)) {
                goto out;
        }
 
        result = fill_monitor_1(info, &info[1].info1,
-                               SPL_TCPIP_PORT /* FIXME */);
+                               SPL_TCPIP_PORT);
        if (!W_ERROR_IS_OK(result)) {
                goto out;
        }
@@ -8437,7 +8437,7 @@ static WERROR enumprintmonitors_level_2(TALLOC_CTX *mem_ctx,
        *count = 2;
 
        result = fill_monitor_2(info, &info[0].info2,
-                               SPL_LOCAL_PORT, /* FIXME */
+                               SPL_LOCAL_PORT,
                                "Windows NT X86", /* FIXME */
                                "localmon.dll");
        if (!W_ERROR_IS_OK(result)) {
@@ -8445,7 +8445,7 @@ static WERROR enumprintmonitors_level_2(TALLOC_CTX *mem_ctx,
        }
 
        result = fill_monitor_2(info, &info[1].info2,
-                               SPL_TCPIP_PORT, /* FIXME */
+                               SPL_TCPIP_PORT,
                                "Windows NT X86", /* FIXME */
                                "tcpmon.dll");
        if (!W_ERROR_IS_OK(result)) {