login-utils: Use /etc/passwd- as backup file

The name /etc/passwd- is used as backup file by shadow and systemd.

Let's join the group and use /etc/passwd- instead of /etc/passwd.OLD as
well. One backup file on a system is enough.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>

diff --git a/login-utils/setpwnam.c b/login-utils/setpwnam.c
index 55fb174d0d0a4aef439b9d4e0621bcf5e73ac95d..e48e4cedc0595cb9f5f48b96f18909fb35c942a2 100644 (file)
--- a/login-utils/setpwnam.c
+++ b/login-utils/setpwnam.c
@@ -138,9 +138,9 @@ int setpwnam(struct passwd *pwd, const char *prefix)
        }
 
        /* we don't care if we can't remove the backup file */
-       unlink(PASSWD_FILE ".OLD");
+       unlink(PASSWD_FILE "-");
        /* we don't care if we can't create the backup file */
-       ignore_result(link(PASSWD_FILE, PASSWD_FILE ".OLD"));
+       ignore_result(link(PASSWD_FILE, PASSWD_FILE "-"));
        /* we DO care if we can't rename to the passwd file */
        if (rename(tmpname, PASSWD_FILE) < 0)
                goto fail;

diff --git a/login-utils/vipw.c b/login-utils/vipw.c
index 5d8644c8234d221460172d80c24be20cb4ad6cb6..30a4e17011781c684d28168a8e003aeca445f39f 100644 (file)
--- a/login-utils/vipw.c
+++ b/login-utils/vipw.c
@@ -145,7 +145,7 @@ static void pw_write(void)
 {
        char tmp[FILENAMELEN + 4];
 
-       snprintf(tmp, sizeof(tmp), "%s%s", orig_file, ".OLD");
+       snprintf(tmp, sizeof(tmp), "%s%s", orig_file, "-");
        unlink(tmp);
 
        if (link(orig_file, tmp))