From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 20 Jan 2021 08:22:06 +0000 (+0900)
Subject: dhcp: use conservative_rename()
X-Git-Tag: v248-rc1~233^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abcf60e730a8c17bf58843f265a65f1daa9bf616;p=thirdparty%2Fsystemd.git

dhcp: use conservative_rename()
---

diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c
index 8a138ff4b62..69ded6d1482 100644
--- a/src/libsystemd-network/sd-dhcp-lease.c
+++ b/src/libsystemd-network/sd-dhcp-lease.c
@@ -19,6 +19,7 @@
 #include "env-file.h"
 #include "fd-util.h"
 #include "fileio.h"
+#include "fs-util.h"
 #include "hexdecoct.h"
 #include "hostname-util.h"
 #include "in-addr-util.h"
@@ -1023,10 +1024,9 @@ int dhcp_lease_save(sd_dhcp_lease *lease, const char *lease_file) {
         if (r < 0)
                 goto fail;
 
-        if (rename(temp_path, lease_file) < 0) {
-                r = -errno;
+        r = conservative_rename(temp_path, lease_file);
+        if (r < 0)
                 goto fail;
-        }
 
         return 0;