From 2da3dc69e7e11e9d4fe03c1b33c6a99f74405a6c Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 26 May 2020 19:49:26 +0200
Subject: [PATCH] fileio: Rename rename_and_apply_smack to
 rename_and_apply_smack_floor_label.

---
 src/basic/fileio.c      | 2 +-
 src/basic/fileio.h      | 2 +-
 src/sysusers/sysusers.c | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/basic/fileio.c b/src/basic/fileio.c
index 6abe5417a6..f2f1e1139f 100644
--- a/src/basic/fileio.c
+++ b/src/basic/fileio.c
@@ -1197,7 +1197,7 @@ int sync_rights(int from, int to) {
         return fchmod_and_chown(to, st.st_mode & 07777, st.st_uid, st.st_gid);
 }
 
-int rename_and_apply_smack(const char *from, const char *to) {
+int rename_and_apply_smack_floor_label(const char *from, const char *to) {
         int r = 0;
         if (rename(from, to) < 0)
                 return -errno;
diff --git a/src/basic/fileio.h b/src/basic/fileio.h
index 03678d827a..e2830b7963 100644
--- a/src/basic/fileio.h
+++ b/src/basic/fileio.h
@@ -109,4 +109,4 @@ int warn_file_is_world_accessible(const char *filename, struct stat *st, const c
 
 int sync_rights(int from, int to);
 
-int rename_and_apply_smack(const char *temp_path, const char *dest_path);
+int rename_and_apply_smack_floor_label(const char *temp_path, const char *dest_path);
diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index 2cb8172103..6fbd5985d3 100644
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -772,14 +772,14 @@ static int write_files(void) {
 
         /* And make the new files count */
         if (group) {
-                r = rename_and_apply_smack(group_tmp, group_path);
+                r = rename_and_apply_smack_floor_label(group_tmp, group_path);
                 if (r < 0)
                         return r;
 
                 group_tmp = mfree(group_tmp);
         }
         if (gshadow) {
-                r = rename_and_apply_smack(gshadow_tmp, gshadow_path);
+                r = rename_and_apply_smack_floor_label(gshadow_tmp, gshadow_path);
                 if (r < 0)
                         return r;
 
@@ -787,14 +787,14 @@ static int write_files(void) {
         }
 
         if (passwd) {
-                r = rename_and_apply_smack(passwd_tmp, passwd_path);
+                r = rename_and_apply_smack_floor_label(passwd_tmp, passwd_path);
                 if (r < 0)
                         return r;
 
                 passwd_tmp = mfree(passwd_tmp);
         }
         if (shadow) {
-                r = rename_and_apply_smack(shadow_tmp, shadow_path);
+                r = rename_and_apply_smack_floor_label(shadow_tmp, shadow_path);
                 if (r < 0)
                         return r;