summaryrefslogtreecommitdiff
path: root/source3/libsmb
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>1999-12-04 00:49:13 +0000
committerLuke Leighton <lkcl@samba.org>1999-12-04 00:49:13 +0000
commit8a8a7da5186596ee86b0b188156bca7d5e664784 (patch)
tree47481c7cddbe1628736aafcf5bf76978cab34e12 /source3/libsmb
parent0ca1f87930a57dfd2510b98443423d8a67cfa70b (diff)
downloadsamba-8a8a7da5186596ee86b0b188156bca7d5e664784.tar.gz
samba-8a8a7da5186596ee86b0b188156bca7d5e664784.tar.bz2
samba-8a8a7da5186596ee86b0b188156bca7d5e664784.zip
argh! you wouldn't believe what i had to do: use the mid (multiplex id)
to redirect multiple socket-based connnections onto a single client state. argh! (This used to be commit 06390e792cd8aa57a91c3a3d1d267fd1bcdc17a1)
Diffstat (limited to 'source3/libsmb')
-rw-r--r--source3/libsmb/clientgen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index 985d1c496d..fea105887f 100644
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -1597,7 +1597,7 @@ size_t cli_read(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t
int total = -1;
int issued=0;
int received=0;
- int mpx = MAX(cli->max_mux-1, 1);
+ int mpx = MIN(MAX(cli->max_mux-1, 1), MAX_MAX_MUX_LIMIT);
int block = (cli->max_xmit - (smb_size+32)) & ~1023;
int mid;
int blocks = (size + (block-1)) / block;