SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

firstboot: handle missing root password entries

Browse Source 
If /etc/passwd and/or /etc/shadow exist but don't have an existing root entry,
one needs to be added. Previously this only worked if the files didn't exist.
This commit is contained in:
Dan Nicholson
2024-07-31 04:02:39 -06:00
parent 5088de9daa
commit 2319154a6b
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/firstboot/firstboot.c
+16 -8
View File
@@ -908,6 +908,7 @@ static int write_root_passwd(int rfd, int etc_fd, const char *password, const ch
_cleanup_fclose_ FILE *original = NULL, *passwd = NULL;
_cleanup_(unlink_and_freep) char *passwd_tmp = NULL;
int r;
bool found = false;
assert(password);
@@ -932,6 +933,7 @@ static int write_root_passwd(int rfd, int etc_fd, const char *password, const ch
i->pw_passwd = (char *) password;
if (shell)
i->pw_shell = (char *) shell;
found = true;
}
r = putpwent_sane(i, passwd);
@@ -942,6 +944,12 @@ static int write_root_passwd(int rfd, int etc_fd, const char *password, const ch
return r;
} else {
r = fchmod(fileno(passwd), 0644);
if (r < 0)
return -errno;
}
if (!found) {
struct passwd root = {
.pw_name = (char *) "root",
.pw_passwd = (char *) password,
@@ -955,10 +963,6 @@ static int write_root_passwd(int rfd, int etc_fd, const char *password, const ch
if (errno != ENOENT)
return -errno;
r = fchmod(fileno(passwd), 0644);
if (r < 0)
return -errno;
r = putpwent_sane(&root, passwd);
if (r < 0)
return r;
@@ -979,6 +983,7 @@ static int write_root_shadow(int etc_fd, const char *hashed_password) {
_cleanup_fclose_ FILE *original = NULL, *shadow = NULL;
_cleanup_(unlink_and_freep) char *shadow_tmp = NULL;
int r;
bool found = false;
assert(hashed_password);
@@ -1002,6 +1007,7 @@ static int write_root_shadow(int etc_fd, const char *hashed_password) {
if (streq(i->sp_namp, "root")) {
i->sp_pwdp = (char *) hashed_password;
i->sp_lstchg = (long) (now(CLOCK_REALTIME) / USEC_PER_DAY);
found = true;
}
r = putspent_sane(i, shadow);
@@ -1012,6 +1018,12 @@ static int write_root_shadow(int etc_fd, const char *hashed_password) {
return r;
} else {
r = fchmod(fileno(shadow), 0000);
if (r < 0)
return -errno;
}
if (!found) {
struct spwd root = {
.sp_namp = (char*) "root",
.sp_pwdp = (char *) hashed_password,
@@ -1027,10 +1039,6 @@ static int write_root_shadow(int etc_fd, const char *hashed_password) {
if (errno != ENOENT)
return -errno;
r = fchmod(fileno(shadow), 0000);
if (r < 0)
return -errno;
r = putspent_sane(&root, shadow);
if (r < 0)
return r;