From 4094297a53a478f9ed7c4160ed63842a19717ba9 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Sun, 22 Jan 2017 20:03:18 +0000 Subject: Really restore the old behaviour for pw usermod -m It again reinstall missing skel files without overwriting changed one Add a regression test about it Reported by: ae MFC after: 3 days --- pw/psdate.c | 6 +----- pw/pw_user.c | 12 +++--------- 2 files changed, 4 insertions(+), 14 deletions(-) (limited to 'pw') diff --git a/pw/psdate.c b/pw/psdate.c index bd2aa15..b63d882 100644 --- a/pw/psdate.c +++ b/pw/psdate.c @@ -41,12 +41,8 @@ static const char rcsid[] = static int numerics(char const * str) { - int rc = isdigit((unsigned char)*str); - if (rc) - while (isdigit((unsigned char)*str) || *str == 'x') - ++str; - return rc && !*str; + return (str[strspn(str, "0123456789x")] == '\0'); } static int diff --git a/pw/pw_user.c b/pw/pw_user.c index 6e991a8..8cffac9 100644 --- a/pw/pw_user.c +++ b/pw/pw_user.c @@ -1493,7 +1493,7 @@ pw_user_mod(int argc, char **argv, char *arg1) intmax_t id = -1; int ch, fd = -1; size_t i, j; - bool quiet, createhome, pretty, dryrun, nis, edited, docreatehome; + bool quiet, createhome, pretty, dryrun, nis, edited; bool precrypted; mode_t homemode = 0; time_t expire_days, password_days, now; @@ -1503,7 +1503,7 @@ pw_user_mod(int argc, char **argv, char *arg1) passwd = NULL; class = nispasswd = NULL; quiet = createhome = pretty = dryrun = nis = precrypted = false; - edited = docreatehome = false; + edited = false; if (arg1 != NULL) { if (arg1[strspn(arg1, "0123456789")] == '\0') @@ -1697,10 +1697,6 @@ pw_user_mod(int argc, char **argv, char *arg1) edited = true; } - if (createhome && fstatat(conf.rootfd, pwd->pw_dir, &st, 0) == -1) { - docreatehome = true; - } - if (homedir && strcmp(pwd->pw_dir, homedir) != 0) { pwd->pw_dir = homedir; edited = true; @@ -1708,8 +1704,6 @@ pw_user_mod(int argc, char **argv, char *arg1) if (!createhome) warnx("WARNING: home `%s' does not exist", pwd->pw_dir); - else - docreatehome = true; } else if (!S_ISDIR(st.st_mode)) { warnx("WARNING: home `%s' is not a directory", pwd->pw_dir); @@ -1801,7 +1795,7 @@ pw_user_mod(int argc, char **argv, char *arg1) * that this also `works' for editing users if -m is used, but * existing files will *not* be overwritten. */ - if (PWALTDIR() != PWF_ALT && docreatehome && pwd->pw_dir && + if (PWALTDIR() != PWF_ALT && createhome && pwd->pw_dir && *pwd->pw_dir == '/' && pwd->pw_dir[1]) { if (!skel) skel = cnf->dotdir; -- cgit v1.2.3-56-ge451