From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 29 Mar 2023 15:52:35 +0000 (+0200)
Subject: user-util: Rename ETC_PASSWD_LOCK_NAME to ETC_PASSWD_LOCK_FILENAME
X-Git-Tag: v254-rc1~872^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fe585662829457aa95d88396916d6a4d642a3677;p=thirdparty%2Fsystemd.git

user-util: Rename ETC_PASSWD_LOCK_NAME to ETC_PASSWD_LOCK_FILENAME
---

diff --git a/src/basic/user-util.h b/src/basic/user-util.h
index c042b67e0ae..f7ff35d0e07 100644
--- a/src/basic/user-util.h
+++ b/src/basic/user-util.h
@@ -80,8 +80,8 @@ int take_etc_passwd_lock(const char *root);
 #define UID_MAPPED_ROOT ((uid_t) (INT32_MAX-1))
 #define GID_MAPPED_ROOT ((gid_t) (INT32_MAX-1))
 
-#define ETC_PASSWD_LOCK_NAME ".pwd.lock"
-#define ETC_PASSWD_LOCK_PATH "/etc/" ETC_PASSWD_LOCK_NAME
+#define ETC_PASSWD_LOCK_FILENAME ".pwd.lock"
+#define ETC_PASSWD_LOCK_PATH "/etc/" ETC_PASSWD_LOCK_FILENAME
 
 /* The following macros add 1 when converting things, since UID 0 is a valid UID, while the pointer
  * NULL is special */
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index c1b739dd4c7..9aaa0af8486 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -969,7 +969,7 @@ static int process_root_account(int rfd) {
                 return 0;
         }
 
-        r = make_lock_file_at(pfd, ETC_PASSWD_LOCK_NAME, LOCK_EX, &lock);
+        r = make_lock_file_at(pfd, ETC_PASSWD_LOCK_FILENAME, LOCK_EX, &lock);
         if (r < 0)
                 return log_error_errno(r, "Failed to take a lock on /etc/passwd: %m");