]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
pylibsmb: Use async cli_rmdir also for smb2
authorVolker Lendecke <vl@samba.org>
Tue, 26 May 2020 07:01:57 +0000 (09:01 +0200)
committerJeremy Allison <jra@samba.org>
Thu, 28 May 2020 19:11:39 +0000 (19:11 +0000)
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/libsmb/pylibsmb.c

index 38bcae73db06802ca625148f900981e159fa94df..20dc3482d60b822bd57b720186f2d6ff54e2fd09 100644 (file)
@@ -1292,19 +1292,15 @@ static PyObject *py_smb_unlink(struct py_cli_state *self, PyObject *args)
 static NTSTATUS remove_dir(struct py_cli_state *self, const char *dirname)
 {
        NTSTATUS status;
+       struct tevent_req *req = NULL;
 
-       if (self->is_smb1) {
-               struct tevent_req *req = NULL;
-
-               req = cli_rmdir_send(NULL, self->ev, self->cli, dirname);
-               if (!py_tevent_req_wait_exc(self, req)) {
-                       return NT_STATUS_INTERNAL_ERROR;
-               }
-               status = cli_rmdir_recv(req);
-               TALLOC_FREE(req);
-       } else {
-               status = cli_rmdir(self->cli, dirname);
+       req = cli_rmdir_send(NULL, self->ev, self->cli, dirname);
+       if (!py_tevent_req_wait_exc(self, req)) {
+               return NT_STATUS_INTERNAL_ERROR;
        }
+       status = cli_rmdir_recv(req);
+       TALLOC_FREE(req);
+
        return status;
 }