diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-11-03 00:15:27 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-11-03 00:15:27 +0100 |
commit | c5a70cab25de3b0acd89ba12150b9077bb59cbb5 (patch) | |
tree | da8887ad758b62641006185c64b7d46c6c650f68 /source3/include/proto.h | |
parent | 1575cae7e53a5738d7e2530e855aef68ca971706 (diff) | |
parent | 7808a2594c22ff452d54d2e9e272aa60e4b7e482 (diff) | |
download | samba-c5a70cab25de3b0acd89ba12150b9077bb59cbb5.tar.gz samba-c5a70cab25de3b0acd89ba12150b9077bb59cbb5.tar.bz2 samba-c5a70cab25de3b0acd89ba12150b9077bb59cbb5.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/include/proto.h')
-rw-r--r-- | source3/include/proto.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index c78c0a0fa7..5ca5c7766f 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -7869,7 +7869,7 @@ NTSTATUS dup_file_fsp(struct smb_request *req, files_struct *fsp, /* The following definitions come from smbd/ipc.c */ void send_trans_reply(connection_struct *conn, - const uint8_t *inbuf, + struct smb_request *req, char *rparam, int rparam_len, char *rdata, int rdata_len, bool buffer_too_large); @@ -8266,6 +8266,12 @@ size_t srvstr_get_path(TALLOC_CTX *ctx, size_t src_len, int flags, NTSTATUS *err); +size_t srvstr_get_path_req_wcard(TALLOC_CTX *mem_ctx, struct smb_request *req, + char **pp_dest, const char *src, int flags, + NTSTATUS *err, bool *contains_wcard); +size_t srvstr_get_path_req(TALLOC_CTX *mem_ctx, struct smb_request *req, + char **pp_dest, const char *src, int flags, + NTSTATUS *err); bool check_fsp_open(connection_struct *conn, struct smb_request *req, files_struct *fsp); bool check_fsp(connection_struct *conn, struct smb_request *req, |