diff options
| author | Jeremy Allison <jra@samba.org> | 2013-08-07 16:03:00 -0700 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2013-08-15 09:07:06 +0200 |
| commit | 04d396566b90f32dc239450596ab50502f9cbb02 (patch) | |
| tree | 81d44acf99a75c867c750826378b833806ac24de /source3/libsmb/clifile.c | |
| parent | 46da267afd540fe2d31f1395cda9e2853cf6432a (diff) | |
| download | samba-04d396566b90f32dc239450596ab50502f9cbb02.tar.gz samba-04d396566b90f32dc239450596ab50502f9cbb02.tar.bz2 samba-04d396566b90f32dc239450596ab50502f9cbb02.zip | |
s3:libsmb: Plumb cli_smb2_rmdir() inside cli_rmdir().
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/libsmb/clifile.c')
| -rw-r--r-- | source3/libsmb/clifile.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c index 9659fc1a81..d63734d3f7 100644 --- a/source3/libsmb/clifile.c +++ b/source3/libsmb/clifile.c @@ -1635,11 +1635,17 @@ NTSTATUS cli_rmdir_recv(struct tevent_req *req) NTSTATUS cli_rmdir(struct cli_state *cli, const char *dname) { - TALLOC_CTX *frame = talloc_stackframe(); + TALLOC_CTX *frame = NULL; struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_OK; + if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) { + return cli_smb2_rmdir(cli, dname); + } + + frame = talloc_stackframe(); + if (smbXcli_conn_has_async_calls(cli->conn)) { /* * Can't use sync call while an async call is in flight |