From fe585662829457aa95d88396916d6a4d642a3677 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Wed, 29 Mar 2023 17:52:35 +0200 Subject: [PATCH] user-util: Rename ETC_PASSWD_LOCK_NAME to ETC_PASSWD_LOCK_FILENAME --- src/basic/user-util.h | 4 ++-- src/firstboot/firstboot.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/basic/user-util.h b/src/basic/user-util.h index c042b67e0a..f7ff35d0e0 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 c1b739dd4c..9aaa0af848 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");