| From f838998f3f28d93a8085047725da96404b0ae56c Mon Sep 17 00:00:00 2001 |
| From: Pierre-Hugues Husson <phh@phh.me> |
| Date: Sat, 17 Feb 2018 19:39:38 +0100 |
| Subject: [PATCH 1/2] Allow deletion of symlink |
| |
| Change-Id: I9731895f88729072297f753088583aabbe6990f4 |
| --- |
| Ext4Crypt.cpp | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/Ext4Crypt.cpp b/Ext4Crypt.cpp |
| index dc2e42a..6398464 100644 |
| --- a/Ext4Crypt.cpp |
| +++ b/Ext4Crypt.cpp |
| @@ -211,6 +211,7 @@ static bool prepare_dir(const std::string& dir, mode_t mode, uid_t uid, gid_t gi |
| static bool destroy_dir(const std::string& dir) { |
| LOG(DEBUG) << "Destroying: " << dir; |
| if (rmdir(dir.c_str()) != 0 && errno != ENOENT) { |
| + if(unlink(dir.c_str()) == 0) return true; |
| PLOG(ERROR) << "Failed to destroy " << dir; |
| return false; |
| } |
| -- |
| 2.15.1 |
| |