emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merge pull request #177 from edneville/conflicts_between_system_users_useradd_and_pwck

Browse Source 
pwck.c: only check home dirs if set and not a system user
This commit is contained in:
Serge Hallyn 2019-10-05 22:08:08 -05:00 committed by GitHub
commit e78d22469f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/pwck.c
View File

@ -389,6 +389,8 @@ static void check_pw_file (int *errors, bool *changed)
struct commonio_entry *pfe, *tpfe; struct commonio_entry *pfe, *tpfe;
struct passwd *pwd; struct passwd *pwd;
struct spwd *spw; struct spwd *spw;
uid_t min_sys_id = (uid_t) getdef_ulong ("SYS_UID_MIN", 101UL);
uid_t max_sys_id = (uid_t) getdef_ulong ("SYS_UID_MAX", 999UL);
/* /*
* Loop through the entire password file. * Loop through the entire password file.
@ -518,15 +520,20 @@ static void check_pw_file (int *errors, bool *changed)
} }
/* /*
* Make sure the home directory exists * If uid is system and has a home directory, then check
*/ */
if (!quiet && (access (pwd->pw_dir, F_OK) != 0)) { if (!(pwd->pw_uid >= min_sys_id && pwd->pw_uid <= max_sys_id && pwd->pw_dir && pwd->pw_dir[0])) {
/* /*
* Home directory doesn't exist, give a warning * Make sure the home directory exists
*/ */
printf (_("user '%s': directory '%s' does not exist\n"), if (!quiet && (access (pwd->pw_dir, F_OK) != 0)) {
pwd->pw_name, pwd->pw_dir); /*
*errors += 1; * Home directory doesn't exist, give a warning
*/
printf (_("user '%s': directory '%s' does not exist\n"),
pwd->pw_name, pwd->pw_dir);
*errors += 1;
}
} }
/* /*