From 1957c8c881e232843a8d1617d66f223bf1e229c9 Mon Sep 17 00:00:00 2001 From: Alejandro Colomar Date: Sat, 4 Feb 2023 20:52:54 +0100 Subject: [PATCH] newusers: Add missing error handling Some errors were being reported in stderr, but then they weren't really being treated as errors. If mkdir(2) for EEXIST, it's possible that the sysadmin pre-created the user dir; don't fail. However, let's keep a log line, for having some notice that it happened. Also, run chmod(2) if mkdir(2) failed for EEXIST (so transform the 'else if' into an 'if'). Cc: Serge Hallyn Signed-off-by: Alejandro Colomar --- src/newusers.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/newusers.c b/src/newusers.c index dd6b4421..7ff62c9c 100644 --- a/src/newusers.c +++ b/src/newusers.c @@ -1252,13 +1252,20 @@ int main (int argc, char **argv) _("%s: line %d: mkdir %s failed: %s\n"), Prog, line, newpw.pw_dir, strerror (errno)); - } else if (chown (newpw.pw_dir, + if (errno != EEXIST) { + errors++; + continue; + } + } + if (chown (newpw.pw_dir, newpw.pw_uid, newpw.pw_gid) != 0) { fprintf (stderr, _("%s: line %d: chown %s failed: %s\n"), Prog, line, newpw.pw_dir, strerror (errno)); + errors++; + continue; } } @@ -1285,12 +1292,15 @@ int main (int argc, char **argv) fprintf (stderr, _("%s: failed to prepare new %s entry\n"), Prog, sub_uid_dbname ()); + errors++; + continue; } } else { fprintf (stderr, _("%s: can't find subordinate user range\n"), Prog); errors++; + continue; } } @@ -1305,12 +1315,15 @@ int main (int argc, char **argv) fprintf (stderr, _("%s: failed to prepare new %s entry\n"), Prog, sub_uid_dbname ()); + errors++; + continue; } } else { fprintf (stderr, _("%s: can't find subordinate group range\n"), Prog); errors++; + continue; } } #endif /* ENABLE_SUBIDS */