RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 12:17:44 +00:00
Code Issues Activity Actions

LibC: Allow empty spwd members when writing shadow entries via putspent

Browse source 
Previously there was no way to output an empty value into the shadow
file entries when the spwd members were disabled. This would cause new
user entries to the shadow file to be cluttered with disabled values.
This commit checks if the spwd member value is diabled (-1) and will
output as appropriate.
This commit is contained in:
brapru 2021-05-29 08:40:16 -04:00 • committed by Linus Groh
parent 54578ec5d4
commit af8b7248c8
1 changed files with 66 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

68
Userland/Libraries/LibC/shadow.cpp
View file

@ -236,8 +236,72 @@ int putspent(struct spwd* p, FILE* stream)
return -1; return -1;
} }
int nwritten = fprintf(stream, "%s:%s:%ld:%ld:%ld:%ld:%ld:%ld:%ld\n", p->sp_namp, int nwritten;
p->sp_pwdp, p->sp_lstchg, p->sp_min, p->sp_max, p->sp_warn, p->sp_inact, p->sp_expire, p->sp_flag);
nwritten = fprintf(stream, "%s:%s:", p->sp_namp, p->sp_pwdp);
if (!nwritten || nwritten < 0) {
errno = ferror(stream);
return -1;
}
if (p->sp_lstchg != (long int)-1)
nwritten = fprintf(stream, "%ld:", p->sp_lstchg);
else
nwritten = fprintf(stream, "%c", ':');
if (!nwritten || nwritten < 0) {
errno = ferror(stream);
return -1;
}
if (p->sp_min != (long int)-1)
nwritten = fprintf(stream, "%ld:", p->sp_min);
else
nwritten = fprintf(stream, "%c", ':');
if (!nwritten || nwritten < 0) {
errno = ferror(stream);
return -1;
}
if (p->sp_max != (long int)-1)
nwritten = fprintf(stream, "%ld:", p->sp_max);
else
nwritten = fprintf(stream, "%c", ':');
if (!nwritten || nwritten < 0) {
errno = ferror(stream);
return -1;
}
if (p->sp_warn != (long int)-1)
nwritten = fprintf(stream, "%ld:", p->sp_warn);
else
nwritten = fprintf(stream, "%c", ':');
if (!nwritten || nwritten < 0) {
errno = ferror(stream);
return -1;
}
if (p->sp_inact != (long int)-1)
nwritten = fprintf(stream, "%ld:", p->sp_inact);
else
nwritten = fprintf(stream, "%c", ':');
if (!nwritten || nwritten < 0) {
errno = ferror(stream);
return -1;
}
if (p->sp_expire != (long int)-1)
nwritten = fprintf(stream, "%ld:", p->sp_expire);
else
nwritten = fprintf(stream, "%c", ':');
if (!nwritten || nwritten < 0) {
errno = ferror(stream);
return -1;
}
if (p->sp_flag != (unsigned long int)-1)
nwritten = fprintf(stream, "%ld\n", p->sp_flag);
else
nwritten = fprintf(stream, "%c", '\n');
if (!nwritten || nwritten < 0) { if (!nwritten || nwritten < 0) {
errno = ferror(stream); errno = ferror(stream);
return -1; return -1;