diff options
| author | Volker Lendecke <vl@samba.org> | 2010-10-24 18:27:25 +0200 |
|---|---|---|
| committer | Volker Lendecke <vlendec@samba.org> | 2010-10-24 20:46:28 +0000 |
| commit | 2d51a24ba51934e1a9264ced1d52648a5c4c2cfc (patch) | |
| tree | 0bb14109d972ddc89ecf901242ffbaad671d224a | |
| parent | 28e243f7ad1a0b645a00bb92b43638af5bfe8b8d (diff) | |
| download | samba-2d51a24ba51934e1a9264ced1d52648a5c4c2cfc.tar.gz samba-2d51a24ba51934e1a9264ced1d52648a5c4c2cfc.tar.bz2 samba-2d51a24ba51934e1a9264ced1d52648a5c4c2cfc.zip | |
s3: Avoid passing down a boolean to cli_posix_unlink_internal_send
| -rw-r--r-- | source3/libsmb/clifile.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c index a0fa7e2870..ee68c6de48 100644 --- a/source3/libsmb/clifile.c +++ b/source3/libsmb/clifile.c @@ -4688,7 +4688,7 @@ static struct tevent_req *cli_posix_unlink_internal_send(TALLOC_CTX *mem_ctx, struct event_context *ev, struct cli_state *cli, const char *fname, - bool is_dir) + uint16_t level) { struct tevent_req *req = NULL, *subreq = NULL; struct unlink_state *state = NULL; @@ -4718,8 +4718,7 @@ static struct tevent_req *cli_posix_unlink_internal_send(TALLOC_CTX *mem_ctx, } /* Setup data word. */ - SSVAL(state->data, 0, is_dir ? SMB_POSIX_UNLINK_DIRECTORY_TARGET : - SMB_POSIX_UNLINK_FILE_TARGET); + SSVAL(state->data, 0, level); subreq = cli_trans_send(state, /* mem ctx. */ ev, /* event ctx. */ @@ -4751,7 +4750,8 @@ struct tevent_req *cli_posix_unlink_send(TALLOC_CTX *mem_ctx, struct cli_state *cli, const char *fname) { - return cli_posix_unlink_internal_send(mem_ctx, ev, cli, fname, false); + return cli_posix_unlink_internal_send(mem_ctx, ev, cli, fname, + SMB_POSIX_UNLINK_FILE_TARGET); } NTSTATUS cli_posix_unlink_recv(struct tevent_req *req) @@ -4817,7 +4817,9 @@ struct tevent_req *cli_posix_rmdir_send(TALLOC_CTX *mem_ctx, struct cli_state *cli, const char *fname) { - return cli_posix_unlink_internal_send(mem_ctx, ev, cli, fname, true); + return cli_posix_unlink_internal_send( + mem_ctx, ev, cli, fname, + SMB_POSIX_UNLINK_DIRECTORY_TARGET); } NTSTATUS cli_posix_rmdir_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx) |