Merge remote-tracking branch 'remotes/origin/branch-netatalk-2-1'

[netatalk.git] / bin / ad / ad_rm.c

diff --git a/bin/ad/ad_rm.c b/bin/ad/ad_rm.c
index 133e5cec7a159b92ec9747a88aec82c8a53f2f16..b9ef2c3c2d941d11b8a0c7eba4227e0e4011a047 100644 (file)
--- a/bin/ad/ad_rm.c
+++ b/bin/ad/ad_rm.c
@@ -303,13 +303,8 @@ static int rm(const char *path,
                 return -1;
             }
 
-            if (!Rflag) {
-                if (volume.volume.vfs->vfs_deletefile(&volume.volume, -1, path) != 0) {
-                    SLOG("Error removing adouble file for: %s", path);
-                    badrm = rval = 1;
-                    break;
-                }
-            }
+            /* Ignore errors, because with -R adouble stuff is always alread gone */
+            volume.volume.vfs->vfs_deletefile(&volume.volume, -1, path);
         }
 
         if (unlink(path) != 0) {