s4:libcli/clideltree: work against servers without NTSTATUS support

[kai/samba.git] / source4 / libcli / clideltree.c

diff --git a/source4/libcli/clideltree.c b/source4/libcli/clideltree.c
index aa73f5b90b2ae3bf520d9ef484c9b4d6e8bcba0a..d947ac3547588efe800cd4deb67972c1c232be2c 100644 (file)
--- a/source4/libcli/clideltree.c
+++ b/source4/libcli/clideltree.c
@@ -5,7 +5,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -14,40 +14,43 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
+#include "system/dir.h"
 
 struct delete_state {
        struct smbcli_tree *tree;
        int total_deleted;
-       BOOL failed;
+       bool failed;
 };
 
 /* 
    callback function for torture_deltree() 
 */
-static void delete_fn(file_info *finfo, const char *name, void *state)
+static void delete_fn(struct clilist_file_info *finfo, const char *name, void *state)
 {
-       struct delete_state *dstate = state;
+       struct delete_state *dstate = (struct delete_state *)state;
        char *s, *n;
-       if (strcmp(finfo->name, ".") == 0 ||
-           strcmp(finfo->name, "..") == 0) return;
+       if (ISDOT(finfo->name) || ISDOTDOT(finfo->name)) {
+               return;
+       }
 
        n = strdup(name);
        n[strlen(n)-1] = 0;
        asprintf(&s, "%s%s", n, finfo->name);
 
-       if (finfo->mode & FILE_ATTRIBUTE_READONLY) {
+       if (finfo->attrib & FILE_ATTRIBUTE_READONLY) {
                if (NT_STATUS_IS_ERR(smbcli_setatr(dstate->tree, s, 0, 0))) {
                        DEBUG(2,("Failed to remove READONLY on %s - %s\n",
                                 s, smbcli_errstr(dstate->tree)));                      
                }
        }
 
-       if (finfo->mode & FILE_ATTRIBUTE_DIRECTORY) {
+       if (finfo->attrib & FILE_ATTRIBUTE_DIRECTORY) {
                char *s2;
                asprintf(&s2, "%s\\*", s);
                smbcli_unlink(dstate->tree, s2);
@@ -58,14 +61,14 @@ static void delete_fn(file_info *finfo, const char *name, void *state)
                if (NT_STATUS_IS_ERR(smbcli_rmdir(dstate->tree, s))) {
                        DEBUG(2,("Failed to delete %s - %s\n", 
                                 s, smbcli_errstr(dstate->tree)));
-                       dstate->failed = True;
+                       dstate->failed = true;
                }
                dstate->total_deleted++;
        } else {
                if (NT_STATUS_IS_ERR(smbcli_unlink(dstate->tree, s))) {
                        DEBUG(2,("Failed to delete %s - %s\n", 
                                 s, smbcli_errstr(dstate->tree)));
-                       dstate->failed = True;
+                       dstate->failed = true;
                }
                dstate->total_deleted++;
        }
@@ -81,20 +84,30 @@ int smbcli_deltree(struct smbcli_tree *tree, const char *dname)
 {
        char *mask;
        struct delete_state dstate;
+       NTSTATUS status;
 
        dstate.tree = tree;
        dstate.total_deleted = 0;
-       dstate.failed = False;
+       dstate.failed = false;
 
        /* it might be a file */
+       status = smbcli_unlink(tree, dname);
        if (NT_STATUS_IS_OK(smbcli_unlink(tree, dname))) {
                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_NO_SUCH_FILE) ||
+           NT_STATUS_EQUAL(smbcli_nt_error(tree), NT_STATUS_DOS(ERRDOS, ERRbadfile))) {
                return 0;
        }
+       if (NT_STATUS_EQUAL(status, NT_STATUS_CANNOT_DELETE)) {
+               /* it could be read-only */
+               status = smbcli_setatr(tree, dname, FILE_ATTRIBUTE_NORMAL, 0);
+               if (NT_STATUS_IS_OK(smbcli_unlink(tree, dname))) {
+                       return 1;
+               }
+       }
 
        asprintf(&mask, "%s\\*", dname);
        smbcli_unlink(dstate.tree, mask);
@@ -102,7 +115,14 @@ int smbcli_deltree(struct smbcli_tree *tree, const char *dname)
                 FILE_ATTRIBUTE_DIRECTORY|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_SYSTEM, 
                 delete_fn, &dstate);
        free(mask);
-       if (NT_STATUS_IS_ERR(smbcli_rmdir(dstate.tree, dname))) {
+
+       status = smbcli_rmdir(dstate.tree, dname);
+       if (NT_STATUS_EQUAL(status, NT_STATUS_CANNOT_DELETE)) {
+               /* it could be read-only */
+               status = smbcli_setatr(dstate.tree, dname, FILE_ATTRIBUTE_NORMAL, 0);
+               status = smbcli_rmdir(dstate.tree, dname);
+       }
+       if (NT_STATUS_IS_ERR(status)) {
                DEBUG(2,("Failed to delete %s - %s\n", 
                         dname, smbcli_errstr(dstate.tree)));
                return -1;