summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-08-08 17:08:35 +0000
committerJeremy Allison <jra@samba.org>2003-08-08 17:08:35 +0000
commit38b3ee6467230955ec94c820f3740eab89534d8c (patch)
treef8445147cd44a7c697efcc8732ca98ec9cb38219
parent56bb027696d5d0c8b72fe9d37d09b00f60b62ca1 (diff)
downloadsamba-38b3ee6467230955ec94c820f3740eab89534d8c.tar.gz
samba-38b3ee6467230955ec94c820f3740eab89534d8c.tar.bz2
samba-38b3ee6467230955ec94c820f3740eab89534d8c.zip
RPC fix from Ronan Waide <waider@waider.ie>. Tested with rpcecho.
Jeremy. (This used to be commit 68590b9e2266cf76b46a68cca0acaa47733811fe)
-rw-r--r--source3/include/rpc_dce.h4
-rw-r--r--source3/libsmb/clireadwrite.c2
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c1
3 files changed, 3 insertions, 4 deletions
diff --git a/source3/include/rpc_dce.h b/source3/include/rpc_dce.h
index dc82f45368..c8c47c4fd8 100644
--- a/source3/include/rpc_dce.h
+++ b/source3/include/rpc_dce.h
@@ -78,8 +78,8 @@ enum netsec_direction
#define AUTH_PIPE_NETSEC 0x0008
/* Maximum PDU fragment size. */
-#define MAX_PDU_FRAG_LEN 0x1630
-/* #define MAX_PDU_FRAG_LEN 0x10b8 this is what w2k sets */
+/* #define MAX_PDU_FRAG_LEN 0x1630 this is what wnt sets */
+#define MAX_PDU_FRAG_LEN 0x10b8 /* this is what w2k sets */
/*
* Actual structure of a DCE UUID
diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
index 0715aa7f1a..8eac7d07d8 100644
--- a/source3/libsmb/clireadwrite.c
+++ b/source3/libsmb/clireadwrite.c
@@ -326,7 +326,7 @@ ssize_t cli_write(struct cli_state *cli,
int issued = 0;
int received = 0;
int mpx = MAX(cli->max_mux-1, 1);
- int block = (cli->max_xmit - (smb_size+32)) & ~1023;
+ int block = cli->max_xmit - (smb_size+32);
int blocks = (size + (block-1)) / block;
while (received < blocks) {
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 8237298ebb..edbd1562bc 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -7100,7 +7100,6 @@ static void fill_port_2(PORT_INFO_2 *port, const char *name)
init_unistr(&port->port_name, name);
init_unistr(&port->monitor_name, "Local Monitor");
init_unistr(&port->description, "Local Port");
-#define PORT_TYPE_WRITE 1
port->port_type=PORT_TYPE_WRITE;
port->reserved=0x0;
}