r13878: move PORT_DATA_1 to use static sized UNICODE strings as per MSDN

(This used to be commit c803e1b2afdfc5bd983f046c976c01adebcfa1ad)

diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index 4d24ee4f0f85dc7baf8546bf9fb0ee6e2413b555..5429511a8b4aa9786c5acbf1e5ae2cc38b37fded 100755 (executable)
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -2174,17 +2174,23 @@ SPOOL_R_GETPRINTPROCESSORDIRECTORY;
 
 /**************************************/
 
+#define MAX_PORTNAME           64
+#define MAX_NETWORK_NAME       49
+#define MAX_SNMP_COMM_NAME     33
+#define        MAX_QUEUE_NAME          33
+#define MAX_IPADDR_STRING      17
+               
 typedef struct {
-       UNISTR portname;        /* constant 64 wchars */
+       uint16 portname[MAX_PORTNAME];
        uint32 version;
        uint32 protocol;
        uint32 size;
        uint32 reserved;
-       UNISTR hostaddress;     /* constant 49 wchars */
-       UNISTR snmpcommunity;   /* constant 33 wchars */
+       uint16 hostaddress[MAX_NETWORK_NAME];
+       uint16 snmpcommunity[MAX_SNMP_COMM_NAME];
        uint32 dblspool;
-       UNISTR queue;           /* constant 33 wchars */
-       UNISTR ipaddress;       /* constant 17 wchars */
+       uint16 queue[MAX_QUEUE_NAME];
+       uint16 ipaddress[MAX_IPADDR_STRING];
        uint32 port;
        uint32 snmpenabled;
        uint32 snmpdevindex;

diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index 6f1ace8214bde6dc91591c64798a7d935f339cb3..5a17860814d134787e1f84244fb9cda9e8ea5efa 100644 (file)
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -7491,28 +7491,21 @@ BOOL make_monitorui_buf( RPC_BUFFER *buf, const char *dllname )
 
 /*******************************************************************
  ********************************************************************/  
+ 
+#define PORT_DATA_1_PAD    540
 
 static BOOL smb_io_port_data_1( const char *desc, RPC_BUFFER *buf, int depth, SPOOL_PORT_DATA_1 *p1 )
 {
        prs_struct *ps = &buf->prs;
-       uint8 *fodder = NULL;
+       uint8 padding[PORT_DATA_1_PAD];
 
        prs_debug(ps, depth, desc, "smb_io_port_data_1");
        depth++;
 
        if(!prs_align(ps))
                return False;   
-               
-       if ( UNMARSHALLING(ps) ) {
-               p1->portname.buffer = PRS_ALLOC_MEM( ps, uint16, 64 );
-               p1->hostaddress.buffer = PRS_ALLOC_MEM( ps, uint16, 49 );
-               p1->snmpcommunity.buffer = PRS_ALLOC_MEM( ps, uint16, 33 );
-               p1->queue.buffer = PRS_ALLOC_MEM( ps, uint16, 33 );
-               p1->ipaddress.buffer = PRS_ALLOC_MEM( ps, uint16, 17 ); 
-               fodder = PRS_ALLOC_MEM( ps, uint8, 540 );       
-       }
 
-       if( !prs_uint16s(True, "portname", ps, depth, p1->portname.buffer, 64))
+       if( !prs_uint16s(True, "portname", ps, depth, p1->portname, MAX_PORTNAME))
                return False;
 
        if (!prs_uint32("version", ps, depth, &p1->version))
@@ -7524,21 +7517,20 @@ static BOOL smb_io_port_data_1( const char *desc, RPC_BUFFER *buf, int depth, SP
        if (!prs_uint32("reserved", ps, depth, &p1->reserved))
                return False;
 
-       if( !prs_uint16s(True, "hostaddress", ps, depth, p1->hostaddress.buffer, 49))
+       if( !prs_uint16s(True, "hostaddress", ps, depth, p1->hostaddress, MAX_NETWORK_NAME))
                return False;
-       if( !prs_uint16s(True, "snmpcommunity", ps, depth, p1->snmpcommunity.buffer, 33))
+       if( !prs_uint16s(True, "snmpcommunity", ps, depth, p1->snmpcommunity, MAX_SNMP_COMM_NAME))
                return False;
 
        if (!prs_uint32("dblspool", ps, depth, &p1->dblspool))
                return False;
                
-       if( !prs_uint16s(True, "queue", ps, depth, p1->queue.buffer, 33))
+       if( !prs_uint16s(True, "queue", ps, depth, p1->queue, MAX_QUEUE_NAME))
                return False;
-       if( !prs_uint16s(True, "ipaddress", ps, depth, p1->ipaddress.buffer, 17))
+       if( !prs_uint16s(True, "ipaddress", ps, depth, p1->ipaddress, MAX_IPADDR_STRING))
                return False;
 
-       /* fodder according to MSDN */
-       if( !prs_uint8s(False, "", ps, depth, fodder, 540))
+       if( !prs_uint8s(False, "", ps, depth, padding, PORT_DATA_1_PAD))
                return False;
                
        if (!prs_uint32("port", ps, depth, &p1->port))
@@ -7563,12 +7555,9 @@ BOOL convert_port_data_1( NT_PORT_DATA_1 *port1, RPC_BUFFER *buf )
        if ( !smb_io_port_data_1( "port_data_1", buf, 0, &spdata_1 ) )
                return False;
                
-       rpcstr_pull(port1->name, spdata_1.portname.buffer, sizeof(port1->name),
-               -1, 0);
-       rpcstr_pull(port1->queue, spdata_1.queue.buffer, sizeof(port1->queue), 
-               -1, 0);
-       rpcstr_pull(port1->hostaddr, spdata_1.hostaddress.buffer, 
-               sizeof(port1->hostaddr), -1, 0);
+       rpcstr_pull(port1->name, spdata_1.portname, sizeof(port1->name), -1, 0);
+       rpcstr_pull(port1->queue, spdata_1.queue, sizeof(port1->queue), -1, 0);
+       rpcstr_pull(port1->hostaddr, spdata_1.hostaddress, sizeof(port1->hostaddr), -1, 0);
        
        port1->port = spdata_1.port;
        

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index a9d4e14aaefb8afe778df98eb33319ee6e74f4b8..938658c47985681414c08a8ddcea031f3ff6a7a4 100644 (file)
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -9528,6 +9528,7 @@ static WERROR process_xcvtcp_command( NT_USER_TOKEN *token, const char *command,
 
 /*******************************************************************
 *******************************************************************/
+#if 0  /* don't support management using the "Local Port" monitor */
 
 static WERROR xcvlocal_monitorui( NT_USER_TOKEN *token, RPC_BUFFER *in, 
                                   RPC_BUFFER *out, uint32 *needed )
@@ -9554,6 +9555,12 @@ struct xcv_api_table xcvlocal_cmds[] = {
        { "MonitorUI",  xcvlocal_monitorui },
        { NULL,         NULL }
 };
+#else
+struct xcv_api_table xcvlocal_cmds[] = {
+       { NULL,         NULL }
+};
+#endif
+
 
 
 /*******************************************************************
@@ -9566,7 +9573,6 @@ static WERROR process_xcvlocal_command( NT_USER_TOKEN *token, const char *comman
        int i;
        
        DEBUG(10,("process_xcvlocal_command: Received command \"%s\"\n", command));
-       
 
        for ( i=0; xcvlocal_cmds[i].name; i++ ) {
                if ( strcmp( command, xcvlocal_cmds[i].name ) == 0 )