summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-03-11 07:58:42 +1100
committerAndrew Bartlett <abartlet@samba.org>2009-03-11 07:58:42 +1100
commit3d0a727f575942b767e396b694f6529259528a17 (patch)
tree8ea6acdfe1b043abe06a0f3d78dcbc1b55d6f146 /source3/include
parentc218d3e1173355acf025471a10b4b6425b9c086b (diff)
parent3d280639c4652d6cd35577e333bcd46c2517754c (diff)
downloadsamba-3d0a727f575942b767e396b694f6529259528a17.tar.gz
samba-3d0a727f575942b767e396b694f6529259528a17.tar.bz2
samba-3d0a727f575942b767e396b694f6529259528a17.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba into wspp-schema
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/proto.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index a1cafb6837..794a006a68 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2790,13 +2790,18 @@ struct async_req *cli_push_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
struct cli_state *cli,
uint16_t fnum, uint16_t mode,
off_t start_offset, size_t window_size,
- size_t (*source)(uint8_t *buf, size_t n,
+ bool caller_buffers,
+ size_t (*source)(uint8_t *inbuf, size_t n,
+ const uint8_t **outbuf,
void *priv),
void *priv);
NTSTATUS cli_push_recv(struct async_req *req);
NTSTATUS cli_push(struct cli_state *cli, uint16_t fnum, uint16_t mode,
off_t start_offset, size_t window_size,
- size_t (*source)(uint8_t *buf, size_t n, void *priv),
+ bool caller_buffers,
+ size_t (*source)(uint8_t *inbuf, size_t n,
+ const uint8_t **outbuf,
+ void *priv),
void *priv);
/* The following definitions come from libsmb/clisecdesc.c */