s4:libcli: cleanup smbcli_deltree()

We already have the 'status' of smbcli_unlink(), so
we can check that directly.

Signed-off-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source4/libcli/clideltree.c b/source4/libcli/clideltree.c
index 7bce95c2a1798d7b0b16415bac023a5fcc02af5d..866b8c5513887358629bf67deb906fb750386d67 100644 (file)
--- a/source4/libcli/clideltree.c
+++ b/source4/libcli/clideltree.c
@@ -99,13 +99,13 @@ int smbcli_deltree(struct smbcli_tree *tree, const char *dname)
 
        /* it might be a file */
        status = smbcli_unlink(tree, dname);
-       if (NT_STATUS_IS_OK(smbcli_unlink(tree, dname))) {
+       if (NT_STATUS_IS_OK(status)) {
                return 1;
        }
-       if (NT_STATUS_EQUAL(smbcli_nt_error(tree), NT_STATUS_OBJECT_NAME_NOT_FOUND) ||
-           NT_STATUS_EQUAL(smbcli_nt_error(tree), NT_STATUS_OBJECT_PATH_NOT_FOUND) ||
-           NT_STATUS_EQUAL(smbcli_nt_error(tree), NT_STATUS_NO_SUCH_FILE) ||
-           NT_STATUS_EQUAL(smbcli_nt_error(tree), NT_STATUS_DOS(ERRDOS, ERRbadfile))) {
+       if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND) ||
+           NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_PATH_NOT_FOUND) ||
+           NT_STATUS_EQUAL(status, NT_STATUS_NO_SUCH_FILE) ||
+           NT_STATUS_EQUAL(status, NT_STATUS_DOS(ERRDOS, ERRbadfile))) {
                return 0;
        }
        if (NT_STATUS_EQUAL(status, NT_STATUS_CANNOT_DELETE)) {