|
 |
fd2e1e |
From 7c2726e8d9c3aa5f8f6710a7ea147bf99877e1a5 Mon Sep 17 00:00:00 2001
|
|
|
fd2e1e |
From: Radovan Sroka <rsroka@redhat.com>
|
|
|
fd2e1e |
Date: Tue, 16 Mar 2021 12:49:48 +0100
|
|
|
fd2e1e |
Subject: [PATCH] Fixed problem with startup failed on unlink() (#120)
|
|
|
fd2e1e |
|
|
|
fd2e1e |
- introduced in 128e22d0c638aed81337a6dbbfa664e5bfc9ea06
|
|
|
fd2e1e |
|
|
|
fd2e1e |
- daemon does not start when unlinking non existing db
|
|
|
fd2e1e |
- fapolicyd-cli returned error when there is no db to unlink
|
|
|
fd2e1e |
|
|
|
fd2e1e |
Signed-off-by: Radovan Sroka <rsroka@redhat.com>
|
|
|
fd2e1e |
---
|
|
|
fd2e1e |
src/library/database.c | 4 ++--
|
|
|
fd2e1e |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
fd2e1e |
|
|
|
fd2e1e |
diff --git a/src/library/database.c b/src/library/database.c
|
|
|
fd2e1e |
index a010923..59816cb 100644
|
|
|
fd2e1e |
--- a/src/library/database.c
|
|
|
fd2e1e |
+++ b/src/library/database.c
|
|
|
fd2e1e |
@@ -718,13 +718,13 @@ int unlink_db(void)
|
|
|
fd2e1e |
|
|
|
fd2e1e |
snprintf(path, sizeof(path), "%s/data.mdb", data_dir);
|
|
|
fd2e1e |
rc = unlink(path);
|
|
|
fd2e1e |
- if (rc) {
|
|
|
fd2e1e |
+ if (rc == -1 && errno != ENOENT) {
|
|
|
fd2e1e |
msg(LOG_ERR, "Could not unlink %s (%s)", path, strerror(errno));
|
|
|
fd2e1e |
ret_val = 1;
|
|
|
fd2e1e |
}
|
|
|
fd2e1e |
snprintf(path, sizeof(path), "%s/lock.mdb", data_dir);
|
|
|
fd2e1e |
rc = unlink(path);
|
|
|
fd2e1e |
- if (rc) {
|
|
|
fd2e1e |
+ if (rc == -1 && errno != ENOENT) {
|
|
|
fd2e1e |
msg(LOG_ERR, "Could not unlink %s (%s)", path, strerror(errno));
|
|
|
fd2e1e |
ret_val = 1;
|
|
|
fd2e1e |
}
|