diff options
| author | Matthew Chapman <matty@samba.org> | 1999-07-22 10:54:49 +0000 |
|---|---|---|
| committer | Matthew Chapman <matty@samba.org> | 1999-07-22 10:54:49 +0000 |
| commit | 30beb2dd109e26abbe4d773671909b1fdf3a0e62 (patch) | |
| tree | 89ee14f0561e5db70587a7100121da8093da4c40 /source3/rpc_client/cli_pipe.c | |
| parent | 0091c7768dc37c22206b345b306441583204dcba (diff) | |
| download | samba-30beb2dd109e26abbe4d773671909b1fdf3a0e62.tar.gz samba-30beb2dd109e26abbe4d773671909b1fdf3a0e62.tar.bz2 samba-30beb2dd109e26abbe4d773671909b1fdf3a0e62.zip | |
BDC support.
Added synchronise_passdb function to update accounts in a BDC's smbpasswd.
Improved rpc_read, which was still somewhat broken for multiple PDU's.
modify_trust_password must initialise cli.pwd (pwd_set_nullpwd).
(This used to be commit 4783ac3968df1c5c8aa0b6ba9144df8b01ae0b99)
Diffstat (limited to 'source3/rpc_client/cli_pipe.c')
| -rw-r--r-- | source3/rpc_client/cli_pipe.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index 54ddac6f78..c8f2593858 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -51,13 +51,10 @@ static BOOL rpc_read(struct cli_state *cli, uint16 nt_pipe_fnum, uint32 rdata_offset) { int size = cli->max_recv_frag; - int file_offset = rdata_offset; + int file_offset = 0; int num_read; char *data; - uint32 err; - uint32 new_data_size = rdata->data->data_used + data_to_read; - - file_offset -= rdata_offset; + uint32 new_data_size = rdata_offset + data_to_read; DEBUG(5,("rpc_read: data_to_read: %d data offset: %d file offset: %d\n", data_to_read, rdata_offset, file_offset)); @@ -75,14 +72,6 @@ static BOOL rpc_read(struct cli_state *cli, uint16 nt_pipe_fnum, if (size > data_to_read) size = data_to_read; - new_data_size = rdata->data->data_used + size; - - if (new_data_size > rdata->data->data_size) - { - mem_grow_data(&rdata->data, True, new_data_size, True); - DEBUG(5,("rpc_read: grow buffer to %d\n", rdata->data->data_used)); - } - num_read = cli_read(cli, nt_pipe_fnum, data, file_offset, size); DEBUG(5,("rpc_read: read offset: %d read: %d to read: %d\n", @@ -92,13 +81,11 @@ static BOOL rpc_read(struct cli_state *cli, uint16 nt_pipe_fnum, file_offset += num_read; data += num_read; - if (cli_error(cli, NULL, &err)) return False; + if (cli_error(cli, NULL, NULL)) return False; } while (num_read > 0 && data_to_read > 0); - /* && err == (0x80000000 | STATUS_BUFFER_OVERFLOW)); */ - mem_realloc_data(rdata->data, file_offset + rdata_offset); - rdata->data->offset.end = file_offset + rdata_offset; + rdata->data->offset.end = new_data_size; DEBUG(5,("rpc_read: offset end: 0x%x. data left to read:0x%x\n", rdata->data->offset.end, data_to_read)); |