diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index cc68ade..3023995 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,41 @@ shadow-4.1.4.2.tar.bz2 /shadow-4.8.1.tar.xz.asc /shadow-4.9.tar.xz /shadow-4.9.tar.xz.asc +/shadow-4.11.1.tar.xz +/shadow-4.11.1.tar.xz.asc +/shadow-4.12.3.tar.xz +/shadow-4.12.3.tar.xz.asc +/shadow-4.13.tar.xz +/shadow-4.13.tar.xz.asc +/shadow-4.14.0.tar.xz +/shadow-4.14.0.tar.xz.asc +/shadow-4.15.0rc2.tar.xz +/shadow-4.15.0rc2.tar.xz.asc +/shadow-4.15.0rc3.tar.xz +/shadow-4.15.0rc3.tar.xz.asc +/shadow-4.15.0.tar.xz +/shadow-4.15.0.tar.xz.asc +/shadow-4.15.1.tar.xz +/shadow-4.15.1.tar.xz.asc +/shadow-4.16.0.tar.xz +/shadow-4.16.0.tar.xz.asc +/shadow-4.17.0-rc1.tar.xz +/shadow-4.17.0-rc1.tar.xz.asc +/shadow-4.17.0.tar.xz +/shadow-4.17.0.tar.xz.asc +/shadow-4.17.4.tar.xz +/shadow-4.17.4.tar.xz.asc +/shadow-4.18.0.tar.xz +/shadow-4.18.0.tar.xz.asc +/shadow-4.19.0.tar.xz +/shadow-4.19.0.tar.xz.asc +/shadow-4.19.2.tar.xz +/shadow-4.19.2.tar.xz.asc +/shadow-4.19.3.tar.xz +/shadow-4.19.3.tar.xz.asc +/shadow-4.20.0-rc2.tar.xz +/shadow-4.20.0-rc2.tar.xz.asc +/shadow-4.20.0-rc3.tar.xz +/shadow-4.20.0-rc3.tar.xz.asc +/shadow-4.20.0.tar.xz +/shadow-4.20.0.tar.xz.asc diff --git a/passwd.pamd b/passwd.pamd new file mode 100644 index 0000000..fd03d03 --- /dev/null +++ b/passwd.pamd @@ -0,0 +1,5 @@ +#%PAM-1.0 +# This tool only uses the password stack. +password substack system-auth +-password optional pam_gnome_keyring.so use_authtok +password substack postlogin diff --git a/plans/tier0-functional.fmf b/plans/tier0-functional.fmf new file mode 100644 index 0000000..a9939b5 --- /dev/null +++ b/plans/tier0-functional.fmf @@ -0,0 +1,51 @@ +summary: Tier 0 functional tests for shadow-utils +description: | + Run comprehensive system tests for shadow-utils. These tests validate user and group + account management functionality by testing actual system operations including user + creation, password management, group operations, and verification of system files + (i.e. /etc/passwd, /etc/shadow). + +provision: + how: virtual + image: fedora + +prepare: + - name: Install general dependencies + how: install + package: + - expect + - gcc + - git + - libssh-devel + - python3-devel + - python3-pip + + - name: Setup SSH keys for localhost testing + how: shell + script: + - ssh-keygen -t rsa -f /root/.ssh/id_rsa -N "" -q + - cat /root/.ssh/id_rsa.pub >> /root/.ssh/authorized_keys + - chmod 600 /root/.ssh/authorized_keys + - ssh-keyscan -H localhost >> /root/.ssh/known_hosts + + - name: Clone shadow repository + how: shell + script: + - git clone https://github.com/shadow-maint/shadow.git /tmp/shadow-test + + - name: Copy test topology for Fedora CI + how: shell + script: + - cp tests/mhc-fedora-ci.yaml /tmp/shadow-test/tests/system + + - name: Install test dependencies + how: shell + script: + - pip3 install -r /tmp/shadow-test/tests/system/requirements.txt + +execute: + how: tmt + duration: 30m + script: | + cd /tmp/shadow-test/tests/system + pytest --mh-config=mhc-fedora-ci.yaml --mh-lazy-ssh -v diff --git a/shadow-4.11.1-subordinateio-also-compare-the-owner-ID.patch b/shadow-4.11.1-subordinateio-also-compare-the-owner-ID.patch deleted file mode 100644 index e761de0..0000000 --- a/shadow-4.11.1-subordinateio-also-compare-the-owner-ID.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 3ec32f9975f262073f8fbdecd2bfaee4a1d3db48 Mon Sep 17 00:00:00 2001 -From: Iker Pedrosa -Date: Wed, 13 Jul 2022 09:55:14 +0200 -Subject: [PATCH] subordinateio: also compare the owner ID - -IDs already populate /etc/subuid and /etc/subgid files so it's necessary -not only to check for the owner name but also for the owner ID of a -given range. - -Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2093311 - -Signed-off-by: Iker Pedrosa ---- - lib/subordinateio.c | 50 +++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 50 insertions(+) - -diff --git a/lib/subordinateio.c b/lib/subordinateio.c -index 9ca70b8b..6bc45283 100644 ---- a/lib/subordinateio.c -+++ b/lib/subordinateio.c -@@ -17,6 +17,8 @@ - #include - #include - -+#define ID_SIZE 31 -+ - /* - * subordinate_dup: create a duplicate range - * -@@ -745,6 +747,40 @@ gid_t sub_gid_find_free_range(gid_t min, gid_t max, unsigned long count) - return start == ULONG_MAX ? (gid_t) -1 : start; - } - -+static bool get_owner_id(const char *owner, enum subid_type id_type, char *id) -+{ -+ struct passwd *pw; -+ struct group *gr; -+ int ret = 0; -+ -+ switch (id_type) { -+ case ID_TYPE_UID: -+ pw = getpwnam(owner); -+ if (pw == NULL) { -+ return false; -+ } -+ ret = snprintf(id, ID_SIZE, "%u", pw->pw_uid); -+ if (ret < 0 || ret >= ID_SIZE) { -+ return false; -+ } -+ break; -+ case ID_TYPE_GID: -+ gr = getgrnam(owner); -+ if (gr == NULL) { -+ return false; -+ } -+ ret = snprintf(id, ID_SIZE, "%u", gr->gr_gid); -+ if (ret < 0 || ret >= ID_SIZE) { -+ return false; -+ } -+ break; -+ default: -+ return false; -+ } -+ -+ return true; -+} -+ - /* - * int list_owner_ranges(const char *owner, enum subid_type id_type, struct subordinate_range ***ranges) - * -@@ -770,6 +806,8 @@ int list_owner_ranges(const char *owner, enum subid_type id_type, struct subid_r - enum subid_status status; - int count = 0; - struct subid_nss_ops *h; -+ char id[ID_SIZE]; -+ bool have_owner_id; - - *in_ranges = NULL; - -@@ -798,6 +836,8 @@ int list_owner_ranges(const char *owner, enum subid_type id_type, struct subid_r - return -1; - } - -+ have_owner_id = get_owner_id(owner, id_type, id); -+ - commonio_rewind(db); - while ((range = commonio_next(db)) != NULL) { - if (0 == strcmp(range->owner, owner)) { -@@ -808,6 +848,16 @@ int list_owner_ranges(const char *owner, enum subid_type id_type, struct subid_r - goto out; - } - } -+ -+ // Let's also compare with the ID -+ if (have_owner_id == true && 0 == strcmp(range->owner, id)) { -+ if (!append_range(&ranges, range, count++)) { -+ free(ranges); -+ ranges = NULL; -+ count = -1; -+ goto out; -+ } -+ } - } - - out: --- -2.37.3 - diff --git a/shadow-4.2.1-date-parsing.patch b/shadow-4.2.1-date-parsing.patch deleted file mode 100644 index 2a798d0..0000000 --- a/shadow-4.2.1-date-parsing.patch +++ /dev/null @@ -1,69 +0,0 @@ -Index: shadow-4.5/libmisc/getdate.y -=================================================================== ---- shadow-4.5.orig/libmisc/getdate.y -+++ shadow-4.5/libmisc/getdate.y -@@ -152,6 +152,7 @@ static int yyHaveDay; - static int yyHaveRel; - static int yyHaveTime; - static int yyHaveZone; -+static int yyHaveYear; - static int yyTimezone; - static int yyDay; - static int yyHour; -@@ -293,18 +294,21 @@ date : tUNUMBER '/' tUNUMBER { - yyDay = $3; - yyYear = $5; - } -+ yyHaveYear++; - } - | tUNUMBER tSNUMBER tSNUMBER { - /* ISO 8601 format. yyyy-mm-dd. */ - yyYear = $1; - yyMonth = -$2; - yyDay = -$3; -+ yyHaveYear++; - } - | tUNUMBER tMONTH tSNUMBER { - /* e.g. 17-JUN-1992. */ - yyDay = $1; - yyMonth = $2; - yyYear = -$3; -+ yyHaveYear++; - } - | tMONTH tUNUMBER { - yyMonth = $1; -@@ -314,6 +318,7 @@ date : tUNUMBER '/' tUNUMBER { - yyMonth = $1; - yyDay = $2; - yyYear = $4; -+ yyHaveYear++; - } - | tUNUMBER tMONTH { - yyMonth = $2; -@@ -323,6 +328,7 @@ date : tUNUMBER '/' tUNUMBER { - yyMonth = $2; - yyDay = $1; - yyYear = $3; -+ yyHaveYear++; - } - ; - -@@ -395,7 +401,8 @@ relunit : tUNUMBER tYEAR_UNIT { - - number : tUNUMBER - { -- if ((yyHaveTime != 0) && (yyHaveDate != 0) && (yyHaveRel == 0)) -+ if ((yyHaveTime != 0 || $1 >= 100) && !yyHaveYear -+ && (yyHaveDate != 0) && (yyHaveRel == 0)) - yyYear = $1; - else - { -@@ -802,7 +809,7 @@ yylex (void) - return LookupWord (buff); - } - if (c != '(') -- return *yyInput++; -+ return (unsigned char)*yyInput++; - Count = 0; - do - { diff --git a/shadow-4.5-usermod-unlock.patch b/shadow-4.5-usermod-unlock.patch deleted file mode 100644 index e2d70b5..0000000 --- a/shadow-4.5-usermod-unlock.patch +++ /dev/null @@ -1,64 +0,0 @@ -Index: shadow-4.5/src/usermod.c -=================================================================== ---- shadow-4.5.orig/src/usermod.c -+++ shadow-4.5/src/usermod.c -@@ -455,14 +455,17 @@ static char *new_pw_passwd (char *pw_pas - strcat (buf, pw_pass); - pw_pass = buf; - } else if (Uflg && pw_pass[0] == '!') { -- char *s; -+ char *s = pw_pass; - -- if (pw_pass[1] == '\0') { -+ while ('!' == *s) -+ ++s; -+ -+ if (*s == '\0') { - fprintf (stderr, - _("%s: unlocking the user's password would result in a passwordless account.\n" - "You should set a password with usermod -p to unlock this user's password.\n"), - Prog); -- return pw_pass; -+ return NULL; - } - - #ifdef WITH_AUDIT -@@ -471,12 +474,15 @@ static char *new_pw_passwd (char *pw_pas - user_newname, (unsigned int) user_newid, 1); - #endif - SYSLOG ((LOG_INFO, "unlock user '%s' password", user_newname)); -- s = pw_pass; -- while ('\0' != *s) { -- *s = *(s + 1); -- s++; -- } -+ memmove (pw_pass, s, strlen (s) + 1); - } else if (pflg) { -+ if (strchr (user_pass, ':') != NULL) { -+ fprintf (stderr, -+ _("%s: The password field cannot contain a colon character.\n"), -+ Prog); -+ return NULL; -+ -+ } - #ifdef WITH_AUDIT - audit_logger (AUDIT_USER_CHAUTHTOK, Prog, - "updating-password", -@@ -525,6 +531,8 @@ static void new_pwent (struct passwd *pw - if ( (!is_shadow_pwd) - || (strcmp (pwent->pw_passwd, SHADOW_PASSWD_STRING) != 0)) { - pwent->pw_passwd = new_pw_passwd (pwent->pw_passwd); -+ if (pwent->pw_passwd == NULL) -+ fail_exit (E_PW_UPDATE); - } - - if (uflg) { -@@ -639,6 +647,8 @@ static void new_spent (struct spwd *spen - * + aging has been requested - */ - spent->sp_pwdp = new_pw_passwd (spent->sp_pwdp); -+ if (spent->sp_pwdp == NULL) -+ fail_exit(E_PW_UPDATE); - - if (pflg) { - spent->sp_lstchg = (long) gettime () / SCALE; diff --git a/shadow-4.6-move-home.patch b/shadow-4.6-move-home.patch deleted file mode 100644 index cff9561..0000000 --- a/shadow-4.6-move-home.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up shadow-4.6/src/usermod.c.move-home shadow-4.6/src/usermod.c ---- shadow-4.6/src/usermod.c.move-home 2018-05-28 14:59:05.594076665 +0200 -+++ shadow-4.6/src/usermod.c 2018-05-28 15:00:28.479837392 +0200 -@@ -1845,6 +1845,11 @@ static void move_home (void) - Prog, prefix_user_home, prefix_user_newhome); - fail_exit (E_HOMEDIR); - } -+ } else { -+ fprintf (stderr, -+ _("%s: The previous home directory (%s) does " -+ "not exist or is inaccessible. Move cannot be completed.\n"), -+ Prog, prefix_user_home); - } - } - diff --git a/shadow-4.6-sysugid-min-limit.patch b/shadow-4.6-sysugid-min-limit.patch deleted file mode 100644 index 4cea6ef..0000000 --- a/shadow-4.6-sysugid-min-limit.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up shadow-4.6/libmisc/find_new_gid.c.min-limit shadow-4.6/libmisc/find_new_gid.c ---- shadow-4.6/libmisc/find_new_gid.c.min-limit 2018-04-29 18:42:37.000000001 +0200 -+++ shadow-4.6/libmisc/find_new_gid.c 2018-11-06 10:51:20.554963292 +0100 -@@ -82,6 +82,13 @@ static int get_ranges (bool sys_group, g - (unsigned long) *max_id); - return EINVAL; - } -+ /* -+ * Zero is reserved for root and the allocation algorithm does not -+ * work right with it. -+ */ -+ if (*min_id == 0) { -+ *min_id = (gid_t) 1; -+ } - } else { - /* Non-system groups */ - -diff -up shadow-4.6/libmisc/find_new_uid.c.min-limit shadow-4.6/libmisc/find_new_uid.c ---- shadow-4.6/libmisc/find_new_uid.c.min-limit 2018-04-29 18:42:37.000000001 +0200 -+++ shadow-4.6/libmisc/find_new_uid.c 2018-11-06 10:51:39.341399569 +0100 -@@ -82,6 +82,13 @@ static int get_ranges (bool sys_user, ui - (unsigned long) *max_id); - return EINVAL; - } -+ /* -+ * Zero is reserved for root and the allocation algorithm does not -+ * work right with it. -+ */ -+ if (*min_id == 0) { -+ *min_id = (uid_t) 1; -+ } - } else { - /* Non-system users */ - diff --git a/shadow-4.8-goodname.patch b/shadow-4.8-goodname.patch deleted file mode 100644 index f3c18d5..0000000 --- a/shadow-4.8-goodname.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff -up shadow-4.8/libmisc/chkname.c.goodname shadow-4.8/libmisc/chkname.c ---- shadow-4.8/libmisc/chkname.c.goodname 2020-01-13 09:44:41.968507996 +0100 -+++ shadow-4.8/libmisc/chkname.c 2020-01-13 09:46:27.863727732 +0100 -@@ -55,26 +55,44 @@ static bool is_valid_name (const char *n - } - - /* -- * User/group names must match [a-z_][a-z0-9_-]*[$] -- */ -+ * User/group names must match gnu e-regex: -+ * [a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,30}[a-zA-Z0-9_.$-]? -+ * -+ * as a non-POSIX, extension, allow "$" as the last char for -+ * sake of Samba 3.x "add machine script" -+ * -+ * Also do not allow fully numeric names or just "." or "..". -+ */ -+ int numeric; - -- if (('\0' == *name) || -- !((('a' <= *name) && ('z' >= *name)) || ('_' == *name))) { -+ if ('\0' == *name || -+ ('.' == *name && (('.' == name[1] && '\0' == name[2]) || -+ '\0' == name[1])) || -+ !((*name >= 'a' && *name <= 'z') || -+ (*name >= 'A' && *name <= 'Z') || -+ (*name >= '0' && *name <= '9') || -+ *name == '_' || -+ *name == '.')) { - return false; - } - -+ numeric = isdigit(*name); -+ - while ('\0' != *++name) { -- if (!(( ('a' <= *name) && ('z' >= *name) ) || -- ( ('0' <= *name) && ('9' >= *name) ) || -- ('_' == *name) || -- ('-' == *name) || -- ( ('$' == *name) && ('\0' == *(name + 1)) ) -+ if (!((*name >= 'a' && *name <= 'z') || -+ (*name >= 'A' && *name <= 'Z') || -+ (*name >= '0' && *name <= '9') || -+ *name == '_' || -+ *name == '.' || -+ *name == '-' || -+ (*name == '$' && name[1] == '\0') - )) { - return false; - } -+ numeric &= isdigit(*name); - } - -- return true; -+ return !numeric; - } - - bool is_valid_user_name (const char *name) -diff -up shadow-4.8/man/groupadd.8.xml.goodname shadow-4.8/man/groupadd.8.xml ---- shadow-4.8/man/groupadd.8.xml.goodname 2019-07-23 17:26:08.000000000 +0200 -+++ shadow-4.8/man/groupadd.8.xml 2020-01-13 09:44:41.968507996 +0100 -@@ -273,10 +273,12 @@ - - CAVEATS - -- Groupnames must start with a lower case letter or an underscore, -- followed by lower case letters, digits, underscores, or dashes. -- They can end with a dollar sign. -- In regular expression terms: [a-z_][a-z0-9_-]*[$]? -+ Groupnames may contain only lower and upper case letters, digits, -+ underscores, or dashes. They can end with a dollar sign. -+ -+ Dashes are not allowed at the beginning of the groupname. -+ Fully numeric groupnames and groupnames . or .. are -+ also disallowed. - - - Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long. -diff -up shadow-4.8/man/useradd.8.xml.goodname shadow-4.8/man/useradd.8.xml ---- shadow-4.8/man/useradd.8.xml.goodname 2019-10-05 03:23:58.000000000 +0200 -+++ shadow-4.8/man/useradd.8.xml 2020-01-13 09:44:41.968507996 +0100 -@@ -661,10 +661,14 @@ - - - -- Usernames must start with a lower case letter or an underscore, -- followed by lower case letters, digits, underscores, or dashes. -- They can end with a dollar sign. -- In regular expression terms: [a-z_][a-z0-9_-]*[$]? -+ Usernames may contain only lower and upper case letters, digits, -+ underscores, or dashes. They can end with a dollar sign. -+ -+ Dashes are not allowed at the beginning of the username. -+ Fully numeric usernames and usernames . or .. are -+ also disallowed. It is not recommended to use usernames beginning -+ with . character as their home directories will be hidden in -+ the ls output. - - - Usernames may only be up to 32 characters long. diff --git a/shadow-4.8-ignore-login-prompt.patch b/shadow-4.8-ignore-login-prompt.patch deleted file mode 100644 index c93aae7..0000000 --- a/shadow-4.8-ignore-login-prompt.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up shadow-4.8/lib/getdef.c.login-prompt shadow-4.8/lib/getdef.c ---- shadow-4.8/lib/getdef.c.login-prompt 2020-01-13 10:38:44.852796681 +0100 -+++ shadow-4.8/lib/getdef.c 2020-01-13 10:39:54.472612511 +0100 -@@ -98,6 +98,7 @@ static struct itemdef def_table[] = { - {"LASTLOG_UID_MAX", NULL}, - {"LOGIN_RETRIES", NULL}, - {"LOGIN_TIMEOUT", NULL}, -+ {"LOGIN_PLAIN_PROMPT", NULL}, - {"LOG_OK_LOGINS", NULL}, - {"LOG_UNKFAIL_ENAB", NULL}, - {"MAIL_DIR", NULL}, diff --git a/shadow-4.8-long-entry.patch b/shadow-4.8-long-entry.patch deleted file mode 100644 index 64d9636..0000000 --- a/shadow-4.8-long-entry.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -up shadow-4.8/lib/defines.h.long-entry shadow-4.8/lib/defines.h ---- shadow-4.8/lib/defines.h.long-entry 2020-01-13 10:29:45.288957339 +0100 -+++ shadow-4.8/lib/defines.h 2020-01-13 10:30:47.482902954 +0100 -@@ -388,6 +388,9 @@ extern char *strerror (); - # endif - #endif - -+/* Maximum length of passwd entry */ -+#define PASSWD_ENTRY_MAX_LENGTH 32768 -+ - #ifdef HAVE_SECURE_GETENV - # define shadow_getenv(name) secure_getenv(name) - # else -diff -up shadow-4.8/lib/pwio.c.long-entry shadow-4.8/lib/pwio.c ---- shadow-4.8/lib/pwio.c.long-entry 2019-07-23 17:26:08.000000000 +0200 -+++ shadow-4.8/lib/pwio.c 2020-01-13 10:29:45.288957339 +0100 -@@ -79,7 +79,10 @@ static int passwd_put (const void *ent, - || (pw->pw_gid == (gid_t)-1) - || (valid_field (pw->pw_gecos, ":\n") == -1) - || (valid_field (pw->pw_dir, ":\n") == -1) -- || (valid_field (pw->pw_shell, ":\n") == -1)) { -+ || (valid_field (pw->pw_shell, ":\n") == -1) -+ || (strlen (pw->pw_name) + strlen (pw->pw_passwd) + -+ strlen (pw->pw_gecos) + strlen (pw->pw_dir) + -+ strlen (pw->pw_shell) + 100 > PASSWD_ENTRY_MAX_LENGTH)) { - return -1; - } - -diff -up shadow-4.8/lib/sgetpwent.c.long-entry shadow-4.8/lib/sgetpwent.c ---- shadow-4.8/lib/sgetpwent.c.long-entry 2019-10-05 03:23:58.000000000 +0200 -+++ shadow-4.8/lib/sgetpwent.c 2020-01-13 10:29:45.288957339 +0100 -@@ -57,7 +57,7 @@ - struct passwd *sgetpwent (const char *buf) - { - static struct passwd pwent; -- static char pwdbuf[1024]; -+ static char pwdbuf[PASSWD_ENTRY_MAX_LENGTH]; - register int i; - register char *cp; - char *fields[NFIELDS]; -@@ -67,8 +67,10 @@ struct passwd *sgetpwent (const char *bu - * the password structure remain valid. - */ - -- if (strlen (buf) >= sizeof pwdbuf) -+ if (strlen (buf) >= sizeof pwdbuf) { -+ fprintf (stderr, "Too long passwd entry encountered, file corruption?\n"); - return 0; /* fail if too long */ -+ } - strcpy (pwdbuf, buf); - - /* -diff -up shadow-4.8/lib/sgetspent.c.long-entry shadow-4.8/lib/sgetspent.c ---- shadow-4.8/lib/sgetspent.c.long-entry 2019-07-23 17:26:08.000000000 +0200 -+++ shadow-4.8/lib/sgetspent.c 2020-01-13 10:29:45.289957322 +0100 -@@ -48,7 +48,7 @@ - */ - struct spwd *sgetspent (const char *string) - { -- static char spwbuf[1024]; -+ static char spwbuf[PASSWD_ENTRY_MAX_LENGTH]; - static struct spwd spwd; - char *fields[FIELDS]; - char *cp; -@@ -61,6 +61,7 @@ struct spwd *sgetspent (const char *stri - */ - - if (strlen (string) >= sizeof spwbuf) { -+ fprintf (stderr, "Too long shadow entry encountered, file corruption?\n"); - return 0; /* fail if too long */ - } - strcpy (spwbuf, string); -diff -up shadow-4.8/lib/shadowio.c.long-entry shadow-4.8/lib/shadowio.c ---- shadow-4.8/lib/shadowio.c.long-entry 2019-07-23 17:26:08.000000000 +0200 -+++ shadow-4.8/lib/shadowio.c 2020-01-13 10:29:45.289957322 +0100 -@@ -79,7 +79,9 @@ static int shadow_put (const void *ent, - - if ( (NULL == sp) - || (valid_field (sp->sp_namp, ":\n") == -1) -- || (valid_field (sp->sp_pwdp, ":\n") == -1)) { -+ || (valid_field (sp->sp_pwdp, ":\n") == -1) -+ || (strlen (sp->sp_namp) + strlen (sp->sp_pwdp) + -+ 1000 > PASSWD_ENTRY_MAX_LENGTH)) { - return -1; - } - diff --git a/shadow-4.8-selinux-perms.patch b/shadow-4.8-selinux-perms.patch deleted file mode 100644 index dfb32ec..0000000 --- a/shadow-4.8-selinux-perms.patch +++ /dev/null @@ -1,240 +0,0 @@ -diff -up shadow-4.8/src/chgpasswd.c.selinux-perms shadow-4.8/src/chgpasswd.c ---- shadow-4.8/src/chgpasswd.c.selinux-perms 2019-12-01 18:02:43.000000000 +0100 -+++ shadow-4.8/src/chgpasswd.c 2020-01-13 10:21:44.558107260 +0100 -@@ -39,6 +39,13 @@ - #include - #include - #include -+#ifdef WITH_SELINUX -+#include -+#include -+#endif -+#ifdef WITH_LIBAUDIT -+#include -+#endif - #ifdef ACCT_TOOLS_SETUID - #ifdef USE_PAM - #include "pam_defs.h" -@@ -80,6 +87,9 @@ static bool sgr_locked = false; - #endif - static bool gr_locked = false; - -+/* The name of the caller */ -+static char *myname = NULL; -+ - /* local function prototypes */ - static void fail_exit (int code); - static /*@noreturn@*/void usage (int status); -@@ -334,6 +344,63 @@ static void check_perms (void) - #endif /* ACCT_TOOLS_SETUID */ - } - -+#ifdef WITH_SELINUX -+static int -+log_callback (int type, const char *fmt, ...) -+{ -+ int audit_fd; -+ va_list ap; -+ -+ va_start(ap, fmt); -+#ifdef WITH_AUDIT -+ audit_fd = audit_open(); -+ -+ if (audit_fd >= 0) { -+ char *buf; -+ -+ if (vasprintf (&buf, fmt, ap) < 0) -+ goto ret; -+ audit_log_user_avc_message(audit_fd, AUDIT_USER_AVC, buf, NULL, NULL, -+ NULL, 0); -+ audit_close(audit_fd); -+ free(buf); -+ goto ret; -+ } -+ -+#endif -+ vsyslog (LOG_USER | LOG_INFO, fmt, ap); -+ret: -+ va_end(ap); -+ return 0; -+} -+ -+static void -+selinux_check_root (void) -+{ -+ int status = -1; -+ security_context_t user_context; -+ union selinux_callback old_callback; -+ -+ if (is_selinux_enabled() < 1) -+ return; -+ -+ old_callback = selinux_get_callback(SELINUX_CB_LOG); -+ /* setup callbacks */ -+ selinux_set_callback(SELINUX_CB_LOG, (union selinux_callback) &log_callback); -+ if ((status = getprevcon(&user_context)) < 0) { -+ selinux_set_callback(SELINUX_CB_LOG, old_callback); -+ exit(1); -+ } -+ -+ status = selinux_check_access(user_context, user_context, "passwd", "passwd", NULL); -+ -+ selinux_set_callback(SELINUX_CB_LOG, old_callback); -+ freecon(user_context); -+ if (status != 0 && security_getenforce() != 0) -+ exit(1); -+} -+#endif -+ - /* - * open_files - lock and open the group databases - */ -@@ -427,6 +494,7 @@ int main (int argc, char **argv) - - const struct group *gr; - struct group newgr; -+ struct passwd *pw = NULL; - int errors = 0; - int line = 0; - -@@ -436,12 +504,37 @@ int main (int argc, char **argv) - (void) bindtextdomain (PACKAGE, LOCALEDIR); - (void) textdomain (PACKAGE); - -+#ifdef WITH_SELINUX -+ selinux_check_root (); -+#endif -+ - process_root_flag ("-R", argc, argv); - - process_flags (argc, argv); - - OPENLOG ("chgpasswd"); - -+#ifdef WITH_AUDIT -+ audit_help_open (); -+#endif -+ -+ /* -+ * Determine the name of the user that invoked this command. This -+ * is really hit or miss because there are so many ways that command -+ * can be executed and so many ways to trip up the routines that -+ * report the user name. -+ */ -+ pw = get_my_pwent (); -+ if (NULL == pw) { -+ fprintf (stderr, _("%s: Cannot determine your user name.\n"), -+ Prog); -+ SYSLOG ((LOG_WARN, -+ "Cannot determine the user name of the caller (UID %lu)", -+ (unsigned long) getuid ())); -+ exit (E_NOPERM); -+ } -+ myname = xstrdup (pw->pw_name); -+ - check_perms (); - - #ifdef SHADOWGRP -diff -up shadow-4.8/src/chpasswd.c.selinux-perms shadow-4.8/src/chpasswd.c ---- shadow-4.8/src/chpasswd.c.selinux-perms 2019-12-01 18:02:43.000000000 +0100 -+++ shadow-4.8/src/chpasswd.c 2020-01-13 10:21:44.558107260 +0100 -@@ -39,6 +39,13 @@ - #include - #include - #include -+#ifdef WITH_SELINUX -+#include -+#include -+#endif -+#ifdef WITH_LIBAUDIT -+#include -+#endif - #ifdef USE_PAM - #include "pam_defs.h" - #endif /* USE_PAM */ -@@ -332,6 +339,63 @@ static void check_perms (void) - #endif /* USE_PAM */ - } - -+#ifdef WITH_SELINUX -+static int -+log_callback (int type, const char *fmt, ...) -+{ -+ int audit_fd; -+ va_list ap; -+ -+ va_start(ap, fmt); -+#ifdef WITH_AUDIT -+ audit_fd = audit_open(); -+ -+ if (audit_fd >= 0) { -+ char *buf; -+ -+ if (vasprintf (&buf, fmt, ap) < 0) -+ goto ret; -+ audit_log_user_avc_message(audit_fd, AUDIT_USER_AVC, buf, NULL, NULL, -+ NULL, 0); -+ audit_close(audit_fd); -+ free(buf); -+ goto ret; -+ } -+ -+#endif -+ vsyslog (LOG_USER | LOG_INFO, fmt, ap); -+ret: -+ va_end(ap); -+ return 0; -+} -+ -+static void -+selinux_check_root (void) -+{ -+ int status = -1; -+ security_context_t user_context; -+ union selinux_callback old_callback; -+ -+ if (is_selinux_enabled() < 1) -+ return; -+ -+ old_callback = selinux_get_callback(SELINUX_CB_LOG); -+ /* setup callbacks */ -+ selinux_set_callback(SELINUX_CB_LOG, (union selinux_callback) &log_callback); -+ if ((status = getprevcon(&user_context)) < 0) { -+ selinux_set_callback(SELINUX_CB_LOG, old_callback); -+ exit(1); -+ } -+ -+ status = selinux_check_access(user_context, user_context, "passwd", "passwd", NULL); -+ -+ selinux_set_callback(SELINUX_CB_LOG, old_callback); -+ freecon(user_context); -+ if (status != 0 && security_getenforce() != 0) -+ exit(1); -+} -+#endif -+ - /* - * open_files - lock and open the password databases - */ -@@ -428,6 +492,10 @@ int main (int argc, char **argv) - (void) bindtextdomain (PACKAGE, LOCALEDIR); - (void) textdomain (PACKAGE); - -+#ifdef WITH_SELINUX -+ selinux_check_root (); -+#endif -+ - process_root_flag ("-R", argc, argv); - - process_flags (argc, argv); -@@ -440,6 +508,10 @@ int main (int argc, char **argv) - - OPENLOG ("chpasswd"); - -+#ifdef WITH_AUDIT -+ audit_help_open (); -+#endif -+ - check_perms (); - - #ifdef USE_PAM diff --git a/shadow-4.9-audit-update.patch b/shadow-4.9-audit-update.patch deleted file mode 100644 index 99513ef..0000000 --- a/shadow-4.9-audit-update.patch +++ /dev/null @@ -1,2347 +0,0 @@ -diff -up shadow-4.8.1/libmisc/audit_help.c.audit-update shadow-4.8.1/libmisc/audit_help.c ---- shadow-4.8.1/libmisc/audit_help.c.audit-update 2019-07-23 17:26:08.000000000 +0200 -+++ shadow-4.8.1/libmisc/audit_help.c 2020-03-17 16:53:44.371943299 +0100 -@@ -68,7 +68,7 @@ void audit_help_open (void) - * This function will log a message to the audit system using a predefined - * message format. Parameter usage is as follows: - * -- * type - type of message: AUDIT_USER_CHAUTHTOK for changing any account -+ * type - type of message: AUDIT_USER_MGMT for changing any account - * attributes. - * pgname - program's name - * op - operation. "adding user", "changing finger info", "deleting group" -@@ -88,6 +88,39 @@ void audit_logger (int type, unused cons - } - } - -+/* -+ * This function will log a message to the audit system using a predefined -+ * message format. Parameter usage is as follows: -+ * -+ * type - type of message: AUDIT_USER_MGMT for changing any account -+ * attributes. -+ * pgname - program's name -+ * op - operation. "adding user", "changing finger info", "deleting group" -+ * name - user's account or group name. If not available use NULL. -+ * id - uid or gid that the operation is being performed on. This is used -+ * only when user is NULL. -+ * grp - group name associated with event -+ */ -+void audit_logger_with_group (int type, unused const char *pgname, -+ const char *op, const char *name, unsigned int id, -+ const char *grp, shadow_audit_result result) -+{ -+ int len; -+ char enc_group[(GROUP_NAME_MAX_LENGTH*2)+1], buf[1024]; -+ if (audit_fd < 0) { -+ return; -+ } -+ len = strnlen(grp, sizeof(enc_group)/2); -+ if (audit_value_needs_encoding(grp, len)) { -+ snprintf(buf, sizeof(buf), "%s grp=%s", op, -+ audit_encode_value(enc_group, grp, len)); -+ } else { -+ snprintf(buf, sizeof(buf), "%s grp=\"%s\"", op, grp); -+ } -+ audit_log_acct_message (audit_fd, type, NULL, buf, name, id, -+ NULL, NULL, NULL, (int) result); -+} -+ - void audit_logger_message (const char *message, shadow_audit_result result) - { - if (audit_fd < 0) { -diff -up shadow-4.8.1/libmisc/cleanup_group.c.audit-update shadow-4.8.1/libmisc/cleanup_group.c ---- shadow-4.8.1/libmisc/cleanup_group.c.audit-update 2019-07-23 17:26:08.000000000 +0200 -+++ shadow-4.8.1/libmisc/cleanup_group.c 2020-03-17 16:53:44.371943299 +0100 -@@ -83,7 +83,7 @@ void cleanup_report_mod_group (void *cle - gr_dbname (), - info->action)); - #ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_ACCT, Prog, -+ audit_logger (AUDIT_GRP_MGMT, Prog, - info->audit_msg, - info->name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); -@@ -101,7 +101,7 @@ void cleanup_report_mod_gshadow (void *c - sgr_dbname (), - info->action)); - #ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_ACCT, Prog, -+ audit_logger (AUDIT_GRP_MGMT, Prog, - info->audit_msg, - info->name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); -@@ -122,7 +122,7 @@ void cleanup_report_add_group_group (voi - SYSLOG ((LOG_ERR, "failed to add group %s to %s", name, gr_dbname ())); - #ifdef WITH_AUDIT - audit_logger (AUDIT_ADD_GROUP, Prog, -- "adding group to /etc/group", -+ "adding-group", - name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); - #endif -@@ -141,8 +141,8 @@ void cleanup_report_add_group_gshadow (v - - SYSLOG ((LOG_ERR, "failed to add group %s to %s", name, sgr_dbname ())); - #ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_GROUP, Prog, -- "adding group to /etc/gshadow", -+ audit_logger (AUDIT_GRP_MGMT, Prog, -+ "adding-shadow-group", - name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); - #endif -@@ -164,8 +164,8 @@ void cleanup_report_del_group_group (voi - "failed to remove group %s from %s", - name, gr_dbname ())); - #ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_GROUP, Prog, -- "removing group from /etc/group", -+ audit_logger (AUDIT_DEL_GROUP, Prog, -+ "removing-group", - name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); - #endif -@@ -187,8 +187,8 @@ void cleanup_report_del_group_gshadow (v - "failed to remove group %s from %s", - name, sgr_dbname ())); - #ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_GROUP, Prog, -- "removing group from /etc/gshadow", -+ audit_logger (AUDIT_GRP_MGMT, Prog, -+ "removing-shadow-group", - name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); - #endif -@@ -208,7 +208,7 @@ void cleanup_unlock_group (unused void * - Prog, gr_dbname ()); - SYSLOG ((LOG_ERR, "failed to unlock %s", gr_dbname ())); - #ifdef WITH_AUDIT -- audit_logger_message ("unlocking group file", -+ audit_logger_message ("unlocking-group", - SHADOW_AUDIT_FAILURE); - #endif - } -@@ -228,7 +228,7 @@ void cleanup_unlock_gshadow (unused void - Prog, sgr_dbname ()); - SYSLOG ((LOG_ERR, "failed to unlock %s", sgr_dbname ())); - #ifdef WITH_AUDIT -- audit_logger_message ("unlocking gshadow file", -+ audit_logger_message ("unlocking-gshadow", - SHADOW_AUDIT_FAILURE); - #endif - } -diff -up shadow-4.8.1/libmisc/cleanup_user.c.audit-update shadow-4.8.1/libmisc/cleanup_user.c ---- shadow-4.8.1/libmisc/cleanup_user.c.audit-update 2019-07-23 17:26:08.000000000 +0200 -+++ shadow-4.8.1/libmisc/cleanup_user.c 2020-03-17 16:53:44.371943299 +0100 -@@ -65,7 +65,7 @@ void cleanup_report_mod_passwd (void *cl - pw_dbname (), - info->action)); - #ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_ACCT, Prog, -+ audit_logger (AUDIT_USER_MGMT, Prog, - info->audit_msg, - info->name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); -@@ -86,7 +86,7 @@ void cleanup_report_add_user_passwd (voi - SYSLOG ((LOG_ERR, "failed to add user %s to %s", name, pw_dbname ())); - #ifdef WITH_AUDIT - audit_logger (AUDIT_ADD_USER, Prog, -- "adding user to /etc/passwd", -+ "adding-user", - name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); - #endif -@@ -105,8 +105,8 @@ void cleanup_report_add_user_shadow (voi - - SYSLOG ((LOG_ERR, "failed to add user %s to %s", name, spw_dbname ())); - #ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -- "adding user to /etc/shadow", -+ audit_logger (AUDIT_USER_MGMT, Prog, -+ "adding-shadow-user", - name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); - #endif -@@ -125,7 +125,7 @@ void cleanup_unlock_passwd (unused void - Prog, pw_dbname ()); - SYSLOG ((LOG_ERR, "failed to unlock %s", pw_dbname ())); - #ifdef WITH_AUDIT -- audit_logger_message ("unlocking passwd file", -+ audit_logger_message ("unlocking-passwd", - SHADOW_AUDIT_FAILURE); - #endif - } -@@ -144,7 +144,7 @@ void cleanup_unlock_shadow (unused void - Prog, spw_dbname ()); - SYSLOG ((LOG_ERR, "failed to unlock %s", spw_dbname ())); - #ifdef WITH_AUDIT -- audit_logger_message ("unlocking shadow file", -+ audit_logger_message ("unlocking-shadow", - SHADOW_AUDIT_FAILURE); - #endif - } -diff -up shadow-4.8.1/lib/prototypes.h.audit-update shadow-4.8.1/lib/prototypes.h ---- shadow-4.8.1/lib/prototypes.h.audit-update 2020-03-17 16:53:44.364943206 +0100 -+++ shadow-4.8.1/lib/prototypes.h 2020-03-17 16:53:44.371943299 +0100 -@@ -219,12 +219,21 @@ extern int audit_fd; - extern void audit_help_open (void); - /* Use AUDIT_NO_ID when a name is provided to audit_logger instead of an ID */ - #define AUDIT_NO_ID ((unsigned int) -1) -+#ifndef AUDIT_GRP_MGMT -+#define AUDIT_GRP_MGMT 1132 /* Group account was modified */ -+#endif -+#ifndef AUDIT_GRP_CHAUTHTOK -+#define AUDIT_GRP_CHAUTHTOK 1133 /* Group account password was changed */ -+#endif - typedef enum { - SHADOW_AUDIT_FAILURE = 0, - SHADOW_AUDIT_SUCCESS = 1} shadow_audit_result; - extern void audit_logger (int type, const char *pgname, const char *op, - const char *name, unsigned int id, - shadow_audit_result result); -+void audit_logger_with_group (int type, unused const char *pgname, -+ const char *op, const char *name, unsigned int id, -+ const char *grp, shadow_audit_result result); - void audit_logger_message (const char *message, shadow_audit_result result); - #endif - -diff -up shadow-4.8.1/src/chage.c.audit-update shadow-4.8.1/src/chage.c ---- shadow-4.8.1/src/chage.c.audit-update 2019-11-12 01:18:25.000000000 +0100 -+++ shadow-4.8.1/src/chage.c 2020-03-17 16:53:44.371943299 +0100 -@@ -123,9 +123,10 @@ static /*@noreturn@*/void fail_exit (int - - #ifdef WITH_AUDIT - if (E_SUCCESS != code) { -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "change age", -- user_name, (unsigned int) user_uid, 0); -+ audit_logger (AUDIT_USER_MGMT, Prog, -+ "change-age", -+ user_name, (unsigned int) user_uid, -+ SHADOW_AUDIT_FAILURE); - } - #endif - -@@ -883,11 +884,7 @@ int main (int argc, char **argv) - fprintf (stderr, _("%s: Permission denied.\n"), Prog); - fail_exit (E_NOPERM); - } --#ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "display aging info", -- user_name, (unsigned int) user_uid, 1); --#endif -+ /* Displaying fields is not of interest to audit */ - list_fields (); - fail_exit (E_SUCCESS); - } -@@ -906,41 +903,43 @@ int main (int argc, char **argv) - } - #ifdef WITH_AUDIT - else { -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "change all aging information", -- user_name, (unsigned int) user_uid, 1); -+ audit_logger (AUDIT_USER_MGMT, Prog, -+ "change-all-aging-information", -+ user_name, (unsigned int) user_uid, -+ SHADOW_AUDIT_SUCCESS); - } - #endif - } else { - #ifdef WITH_AUDIT - if (Mflg) { -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "change max age", -- user_name, (unsigned int) user_uid, 1); -+ audit_logger (AUDIT_USER_MGMT, Prog, -+ "change-max-age", -+ user_name, (unsigned int) user_uid, -+ SHADOW_AUDIT_SUCCESS); - } - if (mflg) { -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "change min age", -+ audit_logger (AUDIT_USER_MGMT, Prog, -+ "change-min-age", - user_name, (unsigned int) user_uid, 1); - } - if (dflg) { -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "change last change date", -+ audit_logger (AUDIT_USER_MGMT, Prog, -+ "change-last-change-date", - user_name, (unsigned int) user_uid, 1); - } - if (Wflg) { -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "change passwd warning", -+ audit_logger (AUDIT_USER_MGMT, Prog, -+ "change-passwd-warning", - user_name, (unsigned int) user_uid, 1); - } - if (Iflg) { -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "change inactive days", -+ audit_logger (AUDIT_USER_MGMT, Prog, -+ "change-inactive-days", - user_name, (unsigned int) user_uid, 1); - } - if (Eflg) { -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "change passwd expiration", -+ audit_logger (AUDIT_USER_MGMT, Prog, -+ "change-passwd-expiration", - user_name, (unsigned int) user_uid, 1); - } - #endif -diff -up shadow-4.8.1/src/gpasswd.c.audit-update shadow-4.8.1/src/gpasswd.c ---- shadow-4.8.1/src/gpasswd.c.audit-update 2019-07-23 17:26:08.000000000 +0200 -+++ shadow-4.8.1/src/gpasswd.c 2020-03-17 16:53:44.371943299 +0100 -@@ -138,7 +138,7 @@ static void usage (int status) - (void) fputs (_(" -d, --delete USER remove USER from GROUP\n"), usageout); - (void) fputs (_(" -h, --help display this help message and exit\n"), usageout); - (void) fputs (_(" -Q, --root CHROOT_DIR directory to chroot into\n"), usageout); -- (void) fputs (_(" -r, --remove-password remove the GROUP's password\n"), usageout); -+ (void) fputs (_(" -r, --delete-password remove the GROUP's password\n"), usageout); - (void) fputs (_(" -R, --restrict restrict access to GROUP to its members\n"), usageout); - (void) fputs (_(" -M, --members USER,... set the list of members of GROUP\n"), usageout); - #ifdef SHADOWGRP -@@ -397,21 +397,14 @@ static void open_files (void) - - static void log_gpasswd_failure (const char *suffix) - { --#ifdef WITH_AUDIT -- char buf[1024]; --#endif - if (aflg) { - SYSLOG ((LOG_ERR, - "%s failed to add user %s to group %s%s", - myname, user, group, suffix)); - #ifdef WITH_AUDIT -- snprintf (buf, 1023, -- "%s failed to add user %s to group %s%s", -- myname, user, group, suffix); -- buf[1023] = '\0'; -- audit_logger (AUDIT_USER_ACCT, Prog, -- buf, -- group, AUDIT_NO_ID, -+ audit_logger_with_group (AUDIT_USER_MGMT, Prog, -+ "add-user-to-group", -+ user, AUDIT_NO_ID, group, - SHADOW_AUDIT_FAILURE); - #endif - } else if (dflg) { -@@ -419,13 +412,9 @@ static void log_gpasswd_failure (const c - "%s failed to remove user %s from group %s%s", - myname, user, group, suffix)); - #ifdef WITH_AUDIT -- snprintf (buf, 1023, -- "%s failed to remove user %s from group %s%s", -- myname, user, group, suffix); -- buf[1023] = '\0'; -- audit_logger (AUDIT_USER_ACCT, Prog, -- buf, -- group, AUDIT_NO_ID, -+ audit_logger_with_group (AUDIT_USER_MGMT, Prog, -+ "delete-user-from-group", -+ user, AUDIT_NO_ID, group, - SHADOW_AUDIT_FAILURE); - #endif - } else if (rflg) { -@@ -433,13 +422,9 @@ static void log_gpasswd_failure (const c - "%s failed to remove password of group %s%s", - myname, group, suffix)); - #ifdef WITH_AUDIT -- snprintf (buf, 1023, -- "%s failed to remove password of group %s%s", -- myname, group, suffix); -- buf[1023] = '\0'; -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- buf, -- group, AUDIT_NO_ID, -+ audit_logger_with_group (AUDIT_GRP_CHAUTHTOK, Prog, -+ "delete-group-password", -+ myname, AUDIT_NO_ID, group, - SHADOW_AUDIT_FAILURE); - #endif - } else if (Rflg) { -@@ -447,13 +432,9 @@ static void log_gpasswd_failure (const c - "%s failed to restrict access to group %s%s", - myname, group, suffix)); - #ifdef WITH_AUDIT -- snprintf (buf, 1023, -- "%s failed to restrict access to group %s%s", -- myname, group, suffix); -- buf[1023] = '\0'; -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- buf, -- group, AUDIT_NO_ID, -+ audit_logger_with_group (AUDIT_GRP_MGMT, Prog, -+ "restrict-group", -+ myname, AUDIT_NO_ID, group, - SHADOW_AUDIT_FAILURE); - #endif - } else if (Aflg || Mflg) { -@@ -463,13 +444,9 @@ static void log_gpasswd_failure (const c - "%s failed to set the administrators of group %s to %s%s", - myname, group, admins, suffix)); - #ifdef WITH_AUDIT -- snprintf (buf, 1023, -- "%s failed to set the administrators of group %s to %s%s", -- myname, group, admins, suffix); -- buf[1023] = '\0'; -- audit_logger (AUDIT_USER_ACCT, Prog, -- buf, -- group, AUDIT_NO_ID, -+ audit_logger_with_group (AUDIT_GRP_MGMT, Prog, -+ "set-admins-of-group", -+ admins, AUDIT_NO_ID, group, - SHADOW_AUDIT_FAILURE); - #endif - } -@@ -479,13 +456,9 @@ static void log_gpasswd_failure (const c - "%s failed to set the members of group %s to %s%s", - myname, group, members, suffix)); - #ifdef WITH_AUDIT -- snprintf (buf, 1023, -- "%s failed to set the members of group %s to %s%s", -- myname, group, members, suffix); -- buf[1023] = '\0'; -- audit_logger (AUDIT_USER_ACCT, Prog, -- buf, -- group, AUDIT_NO_ID, -+ audit_logger_with_group (AUDIT_USER_MGMT, Prog, -+ "add-users-to-group", -+ members, AUDIT_NO_ID, group, - SHADOW_AUDIT_FAILURE); - #endif - } -@@ -494,13 +467,9 @@ static void log_gpasswd_failure (const c - "%s failed to change password of group %s%s", - myname, group, suffix)); - #ifdef WITH_AUDIT -- snprintf (buf, 1023, -- "%s failed to change password of group %s%s", -- myname, group, suffix); -- buf[1023] = '\0'; -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- buf, -- group, AUDIT_NO_ID, -+ audit_logger_with_group (AUDIT_GRP_CHAUTHTOK, Prog, -+ "change-password", -+ myname, AUDIT_NO_ID, group, - SHADOW_AUDIT_FAILURE); - #endif - } -@@ -531,21 +500,14 @@ static void log_gpasswd_failure_gshadow - - static void log_gpasswd_success (const char *suffix) - { --#ifdef WITH_AUDIT -- char buf[1024]; --#endif - if (aflg) { - SYSLOG ((LOG_INFO, - "user %s added by %s to group %s%s", - user, myname, group, suffix)); - #ifdef WITH_AUDIT -- snprintf (buf, 1023, -- "user %s added by %s to group %s%s", -- user, myname, group, suffix); -- buf[1023] = '\0'; -- audit_logger (AUDIT_USER_ACCT, Prog, -- buf, -- group, AUDIT_NO_ID, -+ audit_logger_with_group (AUDIT_USER_MGMT, Prog, -+ "add-user-to-group", -+ user, AUDIT_NO_ID, group, - SHADOW_AUDIT_SUCCESS); - #endif - } else if (dflg) { -@@ -553,13 +515,9 @@ static void log_gpasswd_success (const c - "user %s removed by %s from group %s%s", - user, myname, group, suffix)); - #ifdef WITH_AUDIT -- snprintf (buf, 1023, -- "user %s removed by %s from group %s%s", -- user, myname, group, suffix); -- buf[1023] = '\0'; -- audit_logger (AUDIT_USER_ACCT, Prog, -- buf, -- group, AUDIT_NO_ID, -+ audit_logger_with_group (AUDIT_USER_MGMT, Prog, -+ "delete-user-from-group", -+ user, AUDIT_NO_ID, group, - SHADOW_AUDIT_SUCCESS); - #endif - } else if (rflg) { -@@ -567,13 +525,9 @@ static void log_gpasswd_success (const c - "password of group %s removed by %s%s", - group, myname, suffix)); - #ifdef WITH_AUDIT -- snprintf (buf, 1023, -- "password of group %s removed by %s%s", -- group, myname, suffix); -- buf[1023] = '\0'; -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- buf, -- group, AUDIT_NO_ID, -+ audit_logger_with_group (AUDIT_GRP_CHAUTHTOK, Prog, -+ "delete-group-password", -+ myname, AUDIT_NO_ID, group, - SHADOW_AUDIT_SUCCESS); - #endif - } else if (Rflg) { -@@ -581,13 +535,9 @@ static void log_gpasswd_success (const c - "access to group %s restricted by %s%s", - group, myname, suffix)); - #ifdef WITH_AUDIT -- snprintf (buf, 1023, -- "access to group %s restricted by %s%s", -- group, myname, suffix); -- buf[1023] = '\0'; -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- buf, -- group, AUDIT_NO_ID, -+ audit_logger_with_group (AUDIT_GRP_MGMT, Prog, -+ "restrict-group", -+ myname, AUDIT_NO_ID, group, - SHADOW_AUDIT_SUCCESS); - #endif - } else if (Aflg || Mflg) { -@@ -597,13 +547,9 @@ static void log_gpasswd_success (const c - "administrators of group %s set by %s to %s%s", - group, myname, admins, suffix)); - #ifdef WITH_AUDIT -- snprintf (buf, 1023, -- "administrators of group %s set by %s to %s%s", -- group, myname, admins, suffix); -- buf[1023] = '\0'; -- audit_logger (AUDIT_USER_ACCT, Prog, -- buf, -- group, AUDIT_NO_ID, -+ audit_logger_with_group (AUDIT_GRP_MGMT, Prog, -+ "set-admins-of-group", -+ admins, AUDIT_NO_ID, group, - SHADOW_AUDIT_SUCCESS); - #endif - } -@@ -613,13 +559,9 @@ static void log_gpasswd_success (const c - "members of group %s set by %s to %s%s", - group, myname, members, suffix)); - #ifdef WITH_AUDIT -- snprintf (buf, 1023, -- "members of group %s set by %s to %s%s", -- group, myname, members, suffix); -- buf[1023] = '\0'; -- audit_logger (AUDIT_USER_ACCT, Prog, -- buf, -- group, AUDIT_NO_ID, -+ audit_logger_with_group (AUDIT_USER_MGMT, Prog, -+ "add-users-to-group", -+ members, AUDIT_NO_ID, group, - SHADOW_AUDIT_SUCCESS); - #endif - } -@@ -628,13 +570,9 @@ static void log_gpasswd_success (const c - "password of group %s changed by %s%s", - group, myname, suffix)); - #ifdef WITH_AUDIT -- snprintf (buf, 1023, -- "password of group %s changed by %s%s", -- group, myname, suffix); -- buf[1023] = '\0'; -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- buf, -- group, AUDIT_NO_ID, -+ audit_logger_with_group (AUDIT_GRP_CHAUTHTOK, Prog, -+ "change-password", -+ myname, AUDIT_NO_ID, group, - SHADOW_AUDIT_SUCCESS); - #endif - } -diff -up shadow-4.8.1/src/groupadd.c.audit-update shadow-4.8.1/src/groupadd.c ---- shadow-4.8.1/src/groupadd.c.audit-update 2019-07-23 17:26:08.000000000 +0200 -+++ shadow-4.8.1/src/groupadd.c 2020-03-17 16:53:44.372943312 +0100 -@@ -131,6 +131,15 @@ static /*@noreturn@*/void usage (int sta - exit (status); - } - -+static void fail_exit(int status) -+{ -+#ifdef WITH_AUDIT -+ audit_logger(AUDIT_ADD_GROUP, Prog, "add-group", group_name, -+ AUDIT_NO_ID, SHADOW_AUDIT_FAILURE); -+#endif -+ exit (status); -+} -+ - /* - * new_grent - initialize the values in a group file entry - * -@@ -214,7 +223,7 @@ static void grp_update (void) - fprintf (stderr, - _("%s: failed to prepare the new %s entry '%s'\n"), - Prog, gr_dbname (), grp.gr_name); -- exit (E_GRP_UPDATE); -+ fail_exit (E_GRP_UPDATE); - } - #ifdef SHADOWGRP - /* -@@ -224,7 +233,7 @@ static void grp_update (void) - fprintf (stderr, - _("%s: failed to prepare the new %s entry '%s'\n"), - Prog, sgr_dbname (), sgrp.sg_name); -- exit (E_GRP_UPDATE); -+ fail_exit (E_GRP_UPDATE); - } - #endif /* SHADOWGRP */ - } -@@ -248,7 +257,7 @@ static void check_new_name (void) - fprintf (stderr, _("%s: '%s' is not a valid group name\n"), - Prog, group_name); - -- exit (E_BAD_ARG); -+ fail_exit (E_BAD_ARG); - } - - /* -@@ -264,11 +273,11 @@ static void close_files (void) - fprintf (stderr, - _("%s: failure while writing changes to %s\n"), - Prog, gr_dbname ()); -- exit (E_GRP_UPDATE); -+ fail_exit (E_GRP_UPDATE); - } - #ifdef WITH_AUDIT - audit_logger (AUDIT_ADD_GROUP, Prog, -- "adding group to /etc/group", -+ "add-group", - group_name, (unsigned int) group_id, - SHADOW_AUDIT_SUCCESS); - #endif -@@ -286,11 +295,11 @@ static void close_files (void) - fprintf (stderr, - _("%s: failure while writing changes to %s\n"), - Prog, sgr_dbname ()); -- exit (E_GRP_UPDATE); -+ fail_exit (E_GRP_UPDATE); - } - #ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_GROUP, Prog, -- "adding group to /etc/gshadow", -+ audit_logger (AUDIT_GRP_MGMT, Prog, -+ "add-shadow-group", - group_name, (unsigned int) group_id, - SHADOW_AUDIT_SUCCESS); - #endif -@@ -304,12 +313,6 @@ static void close_files (void) - #endif /* SHADOWGRP */ - - /* Report success at the system level */ --#ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_GROUP, Prog, -- "", -- group_name, (unsigned int) group_id, -- SHADOW_AUDIT_SUCCESS); --#endif - SYSLOG ((LOG_INFO, "new group: name=%s, GID=%u", - group_name, (unsigned int) group_id)); - del_cleanup (cleanup_report_add_group); -@@ -327,7 +330,7 @@ static void open_files (void) - fprintf (stderr, - _("%s: cannot lock %s; try again later.\n"), - Prog, gr_dbname ()); -- exit (E_GRP_UPDATE); -+ fail_exit (E_GRP_UPDATE); - } - add_cleanup (cleanup_unlock_group, NULL); - -@@ -337,7 +340,7 @@ static void open_files (void) - fprintf (stderr, - _("%s: cannot lock %s; try again later.\n"), - Prog, sgr_dbname ()); -- exit (E_GRP_UPDATE); -+ fail_exit (E_GRP_UPDATE); - } - add_cleanup (cleanup_unlock_gshadow, NULL); - } -@@ -353,7 +356,7 @@ static void open_files (void) - if (gr_open (O_CREAT | O_RDWR) == 0) { - fprintf (stderr, _("%s: cannot open %s\n"), Prog, gr_dbname ()); - SYSLOG ((LOG_WARN, "cannot open %s", gr_dbname ())); -- exit (E_GRP_UPDATE); -+ fail_exit (E_GRP_UPDATE); - } - - #ifdef SHADOWGRP -@@ -363,7 +366,7 @@ static void open_files (void) - _("%s: cannot open %s\n"), - Prog, sgr_dbname ()); - SYSLOG ((LOG_WARN, "cannot open %s", sgr_dbname ())); -- exit (E_GRP_UPDATE); -+ fail_exit (E_GRP_UPDATE); - } - } - #endif /* SHADOWGRP */ -@@ -496,7 +499,7 @@ static void check_flags (void) - fprintf (stderr, - _("%s: group '%s' already exists\n"), - Prog, group_name); -- exit (E_NAME_IN_USE); -+ fail_exit (E_NAME_IN_USE); - } - - if (gflg && (prefix_getgrgid (group_id) != NULL)) { -@@ -515,7 +518,7 @@ static void check_flags (void) - fprintf (stderr, - _("%s: GID '%lu' already exists\n"), - Prog, (unsigned long int) group_id); -- exit (E_GID_IN_USE); -+ fail_exit (E_GID_IN_USE); - } - } - } -@@ -543,7 +546,7 @@ static void check_perms (void) - fprintf (stderr, - _("%s: Cannot determine your user name.\n"), - Prog); -- exit (1); -+ fail_exit (1); - } - - retval = pam_start ("groupadd", pampw->pw_name, &conv, &pamh); -@@ -563,7 +566,7 @@ static void check_perms (void) - if (NULL != pamh) { - (void) pam_end (pamh, retval); - } -- exit (1); -+ fail_exit (1); - } - (void) pam_end (pamh, retval); - #endif /* USE_PAM */ -@@ -596,7 +599,7 @@ int main (int argc, char **argv) - fprintf (stderr, - _("%s: Cannot setup cleanup service.\n"), - Prog); -- exit (1); -+ fail_exit (1); - } - - /* -@@ -618,7 +621,7 @@ int main (int argc, char **argv) - - if (!gflg) { - if (find_new_gid (rflg, &group_id, NULL) < 0) { -- exit (E_GID_IN_USE); -+ fail_exit (E_GID_IN_USE); - } - } - -diff -up shadow-4.8.1/src/groupdel.c.audit-update shadow-4.8.1/src/groupdel.c ---- shadow-4.8.1/src/groupdel.c.audit-update 2019-07-23 17:26:08.000000000 +0200 -+++ shadow-4.8.1/src/groupdel.c 2020-03-17 16:53:44.372943312 +0100 -@@ -106,6 +106,15 @@ static /*@noreturn@*/void usage (int sta - exit (status); - } - -+static void fail_exit(int status) -+{ -+#ifdef WITH_AUDIT -+ audit_logger(AUDIT_GRP_MGMT, Prog, "delete-group", group_name, -+ AUDIT_NO_ID, SHADOW_AUDIT_FAILURE); -+#endif -+ exit (status); -+} -+ - /* - * grp_update - update group file entries - * -@@ -132,7 +141,7 @@ static void grp_update (void) - fprintf (stderr, - _("%s: cannot remove entry '%s' from %s\n"), - Prog, group_name, gr_dbname ()); -- exit (E_GRP_UPDATE); -+ fail_exit (E_GRP_UPDATE); - } - - #ifdef SHADOWGRP -@@ -144,7 +153,7 @@ static void grp_update (void) - fprintf (stderr, - _("%s: cannot remove entry '%s' from %s\n"), - Prog, group_name, sgr_dbname ()); -- exit (E_GRP_UPDATE); -+ fail_exit (E_GRP_UPDATE); - } - } - #endif /* SHADOWGRP */ -@@ -163,12 +172,12 @@ static void close_files (void) - fprintf (stderr, - _("%s: failure while writing changes to %s\n"), - Prog, gr_dbname ()); -- exit (E_GRP_UPDATE); -+ fail_exit (E_GRP_UPDATE); - } - - #ifdef WITH_AUDIT - audit_logger (AUDIT_DEL_GROUP, Prog, -- "removing group from /etc/group", -+ "delete-group", - group_name, (unsigned int) group_id, - SHADOW_AUDIT_SUCCESS); - #endif -@@ -188,12 +197,12 @@ static void close_files (void) - fprintf (stderr, - _("%s: failure while writing changes to %s\n"), - Prog, sgr_dbname ()); -- exit (E_GRP_UPDATE); -+ fail_exit (E_GRP_UPDATE); - } - - #ifdef WITH_AUDIT -- audit_logger (AUDIT_DEL_GROUP, Prog, -- "removing group from /etc/gshadow", -+ audit_logger (AUDIT_GRP_MGMT, Prog, -+ "delete-shadow-group", - group_name, (unsigned int) group_id, - SHADOW_AUDIT_SUCCESS); - #endif -@@ -207,13 +216,6 @@ static void close_files (void) - } - #endif /* SHADOWGRP */ - -- /* Report success at the system level */ --#ifdef WITH_AUDIT -- audit_logger (AUDIT_DEL_GROUP, Prog, -- "", -- group_name, (unsigned int) group_id, -- SHADOW_AUDIT_SUCCESS); --#endif - SYSLOG ((LOG_INFO, "group '%s' removed\n", group_name)); - del_cleanup (cleanup_report_del_group); - } -@@ -230,7 +232,7 @@ static void open_files (void) - fprintf (stderr, - _("%s: cannot lock %s; try again later.\n"), - Prog, gr_dbname ()); -- exit (E_GRP_UPDATE); -+ fail_exit (E_GRP_UPDATE); - } - add_cleanup (cleanup_unlock_group, NULL); - #ifdef SHADOWGRP -@@ -239,7 +241,7 @@ static void open_files (void) - fprintf (stderr, - _("%s: cannot lock %s; try again later.\n"), - Prog, sgr_dbname ()); -- exit (E_GRP_UPDATE); -+ fail_exit (E_GRP_UPDATE); - } - add_cleanup (cleanup_unlock_gshadow, NULL); - } -@@ -257,7 +259,7 @@ static void open_files (void) - _("%s: cannot open %s\n"), - Prog, gr_dbname ()); - SYSLOG ((LOG_WARN, "cannot open %s", gr_dbname ())); -- exit (E_GRP_UPDATE); -+ fail_exit (E_GRP_UPDATE); - } - #ifdef SHADOWGRP - if (is_shadow_grp) { -@@ -266,7 +268,7 @@ static void open_files (void) - _("%s: cannot open %s\n"), - Prog, sgr_dbname ()); - SYSLOG ((LOG_WARN, "cannot open %s", sgr_dbname ())); -- exit (E_GRP_UPDATE); -+ fail_exit (E_GRP_UPDATE); - } - } - #endif /* SHADOWGRP */ -@@ -307,7 +309,7 @@ static void group_busy (gid_t gid) - fprintf (stderr, - _("%s: cannot remove the primary group of user '%s'\n"), - Prog, pwd->pw_name); -- exit (E_GROUP_BUSY); -+ fail_exit (E_GROUP_BUSY); - } - - /* -@@ -392,7 +394,7 @@ int main (int argc, char **argv) - fprintf (stderr, - _("%s: Cannot setup cleanup service.\n"), - Prog); -- exit (1); -+ fail_exit (1); - } - - process_flags (argc, argv); -@@ -406,7 +408,7 @@ int main (int argc, char **argv) - fprintf (stderr, - _("%s: Cannot determine your user name.\n"), - Prog); -- exit (1); -+ fail_exit (1); - } - - retval = pam_start ("groupdel", pampw->pw_name, &conv, &pamh); -@@ -427,7 +429,7 @@ int main (int argc, char **argv) - if (NULL != pamh) { - (void) pam_end (pamh, retval); - } -- exit (1); -+ fail_exit (1); - } - (void) pam_end (pamh, retval); - #endif /* USE_PAM */ -@@ -447,7 +449,7 @@ int main (int argc, char **argv) - fprintf (stderr, - _("%s: group '%s' does not exist\n"), - Prog, group_name); -- exit (E_NOTFOUND); -+ fail_exit (E_NOTFOUND); - } - - group_id = grp->gr_gid; -@@ -471,7 +473,7 @@ int main (int argc, char **argv) - _("%s: %s is the NIS master\n"), - Prog, nis_master); - } -- exit (E_NOTFOUND); -+ fail_exit (E_NOTFOUND); - } - #endif - -diff -up shadow-4.8.1/src/groupmod.c.audit-update shadow-4.8.1/src/groupmod.c ---- shadow-4.8.1/src/groupmod.c.audit-update 2019-07-23 17:26:08.000000000 +0200 -+++ shadow-4.8.1/src/groupmod.c 2020-03-17 16:53:44.372943312 +0100 -@@ -450,7 +450,7 @@ static void close_files (void) - exit (E_GRP_UPDATE); - } - #ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_ACCT, Prog, -+ audit_logger (AUDIT_GRP_MGMT, Prog, - info_group.audit_msg, - group_name, AUDIT_NO_ID, - SHADOW_AUDIT_SUCCESS); -@@ -473,7 +473,14 @@ static void close_files (void) - exit (E_GRP_UPDATE); - } - #ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_ACCT, Prog, -+ /* If both happened, log password change as its more important */ -+ if (pflg) -+ audit_logger (AUDIT_GRP_CHAUTHTOK, Prog, -+ info_gshadow.audit_msg, -+ group_name, AUDIT_NO_ID, -+ SHADOW_AUDIT_SUCCESS); -+ else -+ audit_logger (AUDIT_GRP_MGMT, Prog, - info_gshadow.audit_msg, - group_name, AUDIT_NO_ID, - SHADOW_AUDIT_SUCCESS); -@@ -496,7 +503,7 @@ static void close_files (void) - exit (E_GRP_UPDATE); - } - #ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_ACCT, Prog, -+ audit_logger (AUDIT_GRP_MGMT, Prog, - info_passwd.audit_msg, - group_name, AUDIT_NO_ID, - SHADOW_AUDIT_SUCCESS); -@@ -511,8 +518,8 @@ static void close_files (void) - } - - #ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_ACCT, Prog, -- "modifying group", -+ audit_logger (AUDIT_GRP_MGMT, Prog, -+ "modify-group", - group_name, AUDIT_NO_ID, - SHADOW_AUDIT_SUCCESS); - #endif -@@ -524,6 +531,8 @@ static void close_files (void) - */ - static void prepare_failure_reports (void) - { -+ char *nv_pair, nv[64]; -+ - info_group.name = group_name; - #ifdef SHADOWGRP - info_gshadow.name = group_name; -@@ -536,76 +545,109 @@ static void prepare_failure_reports (voi - #endif - info_passwd.audit_msg = xmalloc (512); - -- (void) snprintf (info_group.audit_msg, 511, -- "changing %s; ", gr_dbname ()); -+ info_group.action = xmalloc (512); - #ifdef SHADOWGRP -- (void) snprintf (info_gshadow.audit_msg, 511, -- "changing %s; ", sgr_dbname ()); -+ info_gshadow.action = xmalloc (512); - #endif -- (void) snprintf (info_passwd.audit_msg, 511, -- "changing %s; ", pw_dbname ()); -+ info_passwd.action = xmalloc (512); - -- info_group.action = info_group.audit_msg -- + strlen (info_group.audit_msg); -+ (void) snprintf (info_group.audit_msg, 511, -+ "changing-group"); - #ifdef SHADOWGRP -- info_gshadow.action = info_gshadow.audit_msg -- + strlen (info_gshadow.audit_msg); -+ (void) snprintf (info_gshadow.audit_msg, 511, -+ "changing-shadow-group"); - #endif -- info_passwd.action = info_passwd.audit_msg -- + strlen (info_passwd.audit_msg); -+ (void) snprintf (info_passwd.audit_msg, 511, -+ "changing-group-passwd"); - -+ nv_pair = audit_encode_nv_string(" grp", group_name, -+ strlen(group_name)); -+ if(nv_pair) { -+ strncat(info_group.audit_msg, nv_pair, -+ 511 - strlen(info_group.audit_msg)); -+#ifdef SHADOWGRP -+ strncat(info_gshadow.audit_msg, nv_pair, -+ 511 - strlen(info_gshadow.audit_msg)); -+#endif -+ strncat(info_passwd.audit_msg, nv_pair, -+ 511 - strlen(info_passwd.audit_msg)); -+ free(nv_pair); -+ } -+ snprintf(nv, sizeof(nv), " gid=%lu", (unsigned long)group_id); -+ strncat(info_group.audit_msg, nv, 511 - strlen(info_group.audit_msg)); -+ strncat(info_passwd.audit_msg, nv, 511 - strlen(info_passwd.audit_msg)); -+ - (void) snprintf (info_group.action, -- 511 - strlen (info_group.audit_msg), -+ 511, - "group %s/%lu", - group_name, (unsigned long int) group_id); - #ifdef SHADOWGRP - (void) snprintf (info_gshadow.action, -- 511 - strlen (info_group.audit_msg), -+ 511, - "group %s", group_name); - #endif - (void) snprintf (info_passwd.action, -- 511 - strlen (info_group.audit_msg), -+ 511, - "group %s/%lu", - group_name, (unsigned long int) group_id); - - if (nflg) { -+ nv_pair = audit_encode_nv_string(" new_group", group_newname, -+ strlen(group_newname)); -+ strncat(info_group.audit_msg, nv_pair, -+ 511 - strlen(info_group.audit_msg)); - strncat (info_group.action, ", new name: ", -- 511 - strlen (info_group.audit_msg)); -+ 511 - strlen (info_group.action)); - strncat (info_group.action, group_newname, -- 511 - strlen (info_group.audit_msg)); -+ 511 - strlen (info_group.action)); - - #ifdef SHADOWGRP -+ strncat(info_gshadow.audit_msg, nv_pair, -+ 511 - strlen(info_gshadow.audit_msg)); - strncat (info_gshadow.action, ", new name: ", -- 511 - strlen (info_gshadow.audit_msg)); -+ 511 - strlen (info_gshadow.action)); - strncat (info_gshadow.action, group_newname, -- 511 - strlen (info_gshadow.audit_msg)); -+ 511 - strlen (info_gshadow.action)); - #endif - -+ strncat(info_passwd.audit_msg, nv_pair, -+ 511 - strlen(info_passwd.audit_msg)); - strncat (info_passwd.action, ", new name: ", -- 511 - strlen (info_passwd.audit_msg)); -+ 511 - strlen (info_passwd.action)); - strncat (info_passwd.action, group_newname, -- 511 - strlen (info_passwd.audit_msg)); -+ 511 - strlen (info_passwd.action)); -+ free(nv_pair); - } - if (pflg) { -+ strncat(info_passwd.audit_msg, "op=change-password", -+ 511 - strlen (info_passwd.action)); -+ -+ /* Note: audit doesn't want this value recorded */ - strncat (info_group.action, ", new password", -- 511 - strlen (info_group.audit_msg)); -+ 511 - strlen (info_group.action)); - - #ifdef SHADOWGRP - strncat (info_gshadow.action, ", new password", -- 511 - strlen (info_gshadow.audit_msg)); -+ 511 - strlen (info_gshadow.action)); - #endif - } - if (gflg) { -+ snprintf(nv, sizeof(nv), " new_gid=%lu", (unsigned long)group_newid); -+ strncat(info_group.audit_msg, nv, -+ 511 - strlen(info_group.audit_msg)); -+ strncat(info_passwd.audit_msg, nv, -+ 511 - strlen(info_passwd.audit_msg)); -+ - strncat (info_group.action, ", new gid: ", -- 511 - strlen (info_group.audit_msg)); -+ 511 - strlen (info_group.action)); - (void) snprintf (info_group.action+strlen (info_group.action), -- 511 - strlen (info_group.audit_msg), -+ 511 - strlen (info_group.action), - "%lu", (unsigned long int) group_newid); - - strncat (info_passwd.action, ", new gid: ", -- 511 - strlen (info_passwd.audit_msg)); -+ 511 - strlen (info_passwd.action)); - (void) snprintf (info_passwd.action+strlen (info_passwd.action), -- 511 - strlen (info_passwd.audit_msg), -+ 511 - strlen (info_passwd.action), - "%lu", (unsigned long int) group_newid); - } - info_group.audit_msg[511] = '\0'; -@@ -613,6 +655,11 @@ static void prepare_failure_reports (voi - info_gshadow.audit_msg[511] = '\0'; - #endif - info_passwd.audit_msg[511] = '\0'; -+ info_group.action[511] = '\0'; -+#ifdef SHADOWGRP -+ info_gshadow.action[511] = '\0'; -+#endif -+ info_passwd.action[511] = '\0'; - - // FIXME: add a system cleanup - add_cleanup (cleanup_report_mod_group, &info_group); -diff -up shadow-4.8.1/src/newgrp.c.audit-update shadow-4.8.1/src/newgrp.c ---- shadow-4.8.1/src/newgrp.c.audit-update 2020-01-12 15:19:28.000000000 +0100 -+++ shadow-4.8.1/src/newgrp.c 2020-03-17 16:53:44.372943312 +0100 -@@ -206,11 +206,12 @@ static void check_perms (const struct gr - strcmp (cpasswd, grp->gr_passwd) != 0) { - #ifdef WITH_AUDIT - snprintf (audit_buf, sizeof(audit_buf), -- "authentication new-gid=%lu", -+ "authentication new_gid=%lu", - (unsigned long) grp->gr_gid); - audit_logger (AUDIT_GRP_AUTH, Prog, - audit_buf, NULL, -- (unsigned int) getuid (), 0); -+ (unsigned int) getuid (), -+ SHADOW_AUDIT_FAILURE); - #endif - SYSLOG ((LOG_INFO, - "Invalid password for group '%s' from '%s'", -@@ -221,11 +222,12 @@ static void check_perms (const struct gr - } - #ifdef WITH_AUDIT - snprintf (audit_buf, sizeof(audit_buf), -- "authentication new-gid=%lu", -+ "authentication new_gid=%lu", - (unsigned long) grp->gr_gid); - audit_logger (AUDIT_GRP_AUTH, Prog, - audit_buf, NULL, -- (unsigned int) getuid (), 1); -+ (unsigned int) getuid (), -+ SHADOW_AUDIT_SUCCESS); - #endif - } - -@@ -236,19 +238,6 @@ failure: - * harm. -- JWP - */ - closelog (); --#ifdef WITH_AUDIT -- if (groupname) { -- snprintf (audit_buf, sizeof(audit_buf), -- "changing new-group=%s", groupname); -- audit_logger (AUDIT_CHGRP_ID, Prog, -- audit_buf, NULL, -- (unsigned int) getuid (), 0); -- } else { -- audit_logger (AUDIT_CHGRP_ID, Prog, -- "changing", NULL, -- (unsigned int) getuid (), 0); -- } --#endif - exit (EXIT_FAILURE); - } - -@@ -320,15 +309,27 @@ static void syslog_sg (const char *name, - is_newgrp ? "newgrp" : "sg", strerror (errno)); - #ifdef WITH_AUDIT - if (group) { -- snprintf (audit_buf, sizeof(audit_buf), -- "changing new-group=%s", group); -+ char enc_group[(GROUP_NAME_MAX_LENGTH*2)+1]; -+ int len = strnlen(group, sizeof(enc_group)/2); -+ if (audit_value_needs_encoding(group, len)) { -+ snprintf (audit_buf, sizeof(audit_buf), -+ "changing new_group=%s", -+ audit_encode_value(enc_group, -+ group, len)); -+ } else { -+ snprintf (audit_buf, sizeof(audit_buf), -+ "changing new_group=\"%s\"", -+ group); -+ } - audit_logger (AUDIT_CHGRP_ID, Prog, - audit_buf, NULL, -- (unsigned int) getuid (), 0); -+ (unsigned int) getuid (), -+ SHADOW_AUDIT_FAILURE); - } else { - audit_logger (AUDIT_CHGRP_ID, Prog, - "changing", NULL, -- (unsigned int) getuid (), 0); -+ (unsigned int) getuid (), -+ SHADOW_AUDIT_FAILURE); - } - #endif - exit (EXIT_FAILURE); -@@ -458,7 +459,7 @@ int main (int argc, char **argv) - #ifdef WITH_AUDIT - audit_logger (AUDIT_CHGRP_ID, Prog, - "changing", NULL, -- (unsigned int) getuid (), 0); -+ (unsigned int) getuid (), SHADOW_AUDIT_FAILURE); - #endif - SYSLOG ((LOG_WARN, "Cannot determine the user name of the caller (UID %lu)", - (unsigned long) getuid ())); -@@ -574,15 +575,26 @@ int main (int argc, char **argv) - perror ("getgroups"); - #ifdef WITH_AUDIT - if (group) { -- snprintf (audit_buf, sizeof(audit_buf), -- "changing new-group=%s", group); -+ char enc_group[(GROUP_NAME_MAX_LENGTH*2)+1]; -+ int len = strnlen(group, sizeof(enc_group)/2); -+ if (audit_value_needs_encoding(group, len)) { -+ snprintf (audit_buf, sizeof(audit_buf), -+ "changing new_group=%s", -+ audit_encode_value(enc_group, -+ group, len)); -+ } else { -+ snprintf (audit_buf, sizeof(audit_buf), -+ "changing new_group=\"%s\"", group); -+ } - audit_logger (AUDIT_CHGRP_ID, Prog, - audit_buf, NULL, -- (unsigned int) getuid (), 0); -+ (unsigned int) getuid (), -+ SHADOW_AUDIT_FAILURE); - } else { - audit_logger (AUDIT_CHGRP_ID, Prog, - "changing", NULL, -- (unsigned int) getuid (), 0); -+ (unsigned int) getuid (), -+ SHADOW_AUDIT_FAILURE); - } - #endif - exit (EXIT_FAILURE); -@@ -739,10 +751,10 @@ int main (int argc, char **argv) - perror ("setgid"); - #ifdef WITH_AUDIT - snprintf (audit_buf, sizeof(audit_buf), -- "changing new-gid=%lu", (unsigned long) gid); -+ "changing new_gid=%lu", (unsigned long) gid); - audit_logger (AUDIT_CHGRP_ID, Prog, - audit_buf, NULL, -- (unsigned int) getuid (), 0); -+ (unsigned int) getuid (), SHADOW_AUDIT_FAILURE); - #endif - exit (EXIT_FAILURE); - } -@@ -751,10 +763,10 @@ int main (int argc, char **argv) - perror ("setuid"); - #ifdef WITH_AUDIT - snprintf (audit_buf, sizeof(audit_buf), -- "changing new-gid=%lu", (unsigned long) gid); -+ "changing new_gid=%lu", (unsigned long) gid); - audit_logger (AUDIT_CHGRP_ID, Prog, - audit_buf, NULL, -- (unsigned int) getuid (), 0); -+ (unsigned int) getuid (), SHADOW_AUDIT_FAILURE); - #endif - exit (EXIT_FAILURE); - } -@@ -768,10 +780,10 @@ int main (int argc, char **argv) - execl (SHELL, "sh", "-c", command, (char *) 0); - #ifdef WITH_AUDIT - snprintf (audit_buf, sizeof(audit_buf), -- "changing new-gid=%lu", (unsigned long) gid); -+ "changing new_gid=%lu", (unsigned long) gid); - audit_logger (AUDIT_CHGRP_ID, Prog, - audit_buf, NULL, -- (unsigned int) getuid (), 0); -+ (unsigned int) getuid (), SHADOW_AUDIT_FAILURE); - #endif - perror (SHELL); - exit ((errno == ENOENT) ? E_CMD_NOTFOUND : E_CMD_NOEXEC); -@@ -835,11 +847,11 @@ int main (int argc, char **argv) - } - - #ifdef WITH_AUDIT -- snprintf (audit_buf, sizeof(audit_buf), "changing new-gid=%lu", -+ snprintf (audit_buf, sizeof(audit_buf), "changing new_gid=%lu", - (unsigned long) gid); - audit_logger (AUDIT_CHGRP_ID, Prog, - audit_buf, NULL, -- (unsigned int) getuid (), 1); -+ (unsigned int) getuid (), SHADOW_AUDIT_SUCCESS); - #endif - /* - * Exec the login shell and go away. We are trying to get back to -@@ -863,15 +875,24 @@ int main (int argc, char **argv) - closelog (); - #ifdef WITH_AUDIT - if (NULL != group) { -- snprintf (audit_buf, sizeof(audit_buf), -- "changing new-group=%s", group); -+ char enc_group[(GROUP_NAME_MAX_LENGTH*2)+1]; -+ int len = strnlen(group, sizeof(enc_group)/2); -+ if (audit_value_needs_encoding(group, len)) { -+ snprintf (audit_buf, sizeof(audit_buf), -+ "changing new_group=%s", -+ audit_encode_value(enc_group, -+ group, len)); -+ } else { -+ snprintf (audit_buf, sizeof(audit_buf), -+ "changing new_group=\"%s\"", group); -+ } - audit_logger (AUDIT_CHGRP_ID, Prog, - audit_buf, NULL, -- (unsigned int) getuid (), 0); -+ (unsigned int) getuid (), SHADOW_AUDIT_FAILURE); - } else { - audit_logger (AUDIT_CHGRP_ID, Prog, - "changing", NULL, -- (unsigned int) getuid (), 0); -+ (unsigned int) getuid (), SHADOW_AUDIT_FAILURE); - } - #endif - exit (EXIT_FAILURE); -diff -up shadow-4.8.1/src/useradd.c.audit-update shadow-4.8.1/src/useradd.c ---- shadow-4.8.1/src/useradd.c.audit-update 2020-03-17 16:53:44.365943219 +0100 -+++ shadow-4.8.1/src/useradd.c 2020-03-17 17:03:11.614503929 +0100 -@@ -233,6 +233,8 @@ static void create_mail (void); - */ - static void fail_exit (int code) - { -+ int type; -+ - if (home_added) { - if (rmdir (prefix_user_home) != 0) { - fprintf (stderr, -@@ -246,12 +248,6 @@ static void fail_exit (int code) - if (spw_unlock () == 0) { - fprintf (stderr, _("%s: failed to unlock %s\n"), Prog, spw_dbname ()); - SYSLOG ((LOG_ERR, "failed to unlock %s", spw_dbname ())); --#ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -- "unlocking shadow file", -- user_name, AUDIT_NO_ID, -- SHADOW_AUDIT_FAILURE); --#endif - /* continue */ - } - } -@@ -259,12 +255,6 @@ static void fail_exit (int code) - if (pw_unlock () == 0) { - fprintf (stderr, _("%s: failed to unlock %s\n"), Prog, pw_dbname ()); - SYSLOG ((LOG_ERR, "failed to unlock %s", pw_dbname ())); --#ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -- "unlocking passwd file", -- user_name, AUDIT_NO_ID, -- SHADOW_AUDIT_FAILURE); --#endif - /* continue */ - } - } -@@ -272,12 +262,6 @@ static void fail_exit (int code) - if (gr_unlock () == 0) { - fprintf (stderr, _("%s: failed to unlock %s\n"), Prog, gr_dbname ()); - SYSLOG ((LOG_ERR, "failed to unlock %s", gr_dbname ())); --#ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -- "unlocking group file", -- user_name, AUDIT_NO_ID, -- SHADOW_AUDIT_FAILURE); --#endif - /* continue */ - } - } -@@ -286,12 +270,6 @@ static void fail_exit (int code) - if (sgr_unlock () == 0) { - fprintf (stderr, _("%s: failed to unlock %s\n"), Prog, sgr_dbname ()); - SYSLOG ((LOG_ERR, "failed to unlock %s", sgr_dbname ())); --#ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -- "unlocking gshadow file", -- user_name, AUDIT_NO_ID, -- SHADOW_AUDIT_FAILURE); --#endif - /* continue */ - } - } -@@ -301,12 +279,6 @@ static void fail_exit (int code) - if (sub_uid_unlock () == 0) { - fprintf (stderr, _("%s: failed to unlock %s\n"), Prog, sub_uid_dbname ()); - SYSLOG ((LOG_ERR, "failed to unlock %s", sub_uid_dbname ())); --#ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -- "unlocking subordinate user file", -- user_name, AUDIT_NO_ID, -- SHADOW_AUDIT_FAILURE); --#endif - /* continue */ - } - } -@@ -314,20 +286,19 @@ static void fail_exit (int code) - if (sub_gid_unlock () == 0) { - fprintf (stderr, _("%s: failed to unlock %s\n"), Prog, sub_gid_dbname ()); - SYSLOG ((LOG_ERR, "failed to unlock %s", sub_gid_dbname ())); --#ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -- "unlocking subordinate group file", -- user_name, AUDIT_NO_ID, -- SHADOW_AUDIT_FAILURE); --#endif - /* continue */ - } - } - #endif /* ENABLE_SUBIDS */ - - #ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -- "adding user", -+ if (code == E_PW_UPDATE || code >= E_GRP_UPDATE) -+ type = AUDIT_USER_MGMT; -+ else -+ type = AUDIT_ADD_USER; -+ -+ audit_logger (type, Prog, -+ "add-user", - user_name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); - #endif -@@ -692,7 +663,7 @@ static int set_defaults (void) - } - #ifdef WITH_AUDIT - audit_logger (AUDIT_USYS_CONFIG, Prog, -- "changing useradd defaults", -+ "changing-useradd-defaults", - NULL, AUDIT_NO_ID, - SHADOW_AUDIT_SUCCESS); - #endif -@@ -974,12 +945,6 @@ static void grp_update (void) - _("%s: Out of memory. Cannot update %s.\n"), - Prog, gr_dbname ()); - SYSLOG ((LOG_ERR, "failed to prepare the new %s entry '%s'", gr_dbname (), user_name)); --#ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -- "adding user to group", -- user_name, AUDIT_NO_ID, -- SHADOW_AUDIT_FAILURE); --#endif - fail_exit (E_GRP_UPDATE); /* XXX */ - } - -@@ -993,18 +958,12 @@ static void grp_update (void) - _("%s: failed to prepare the new %s entry '%s'\n"), - Prog, gr_dbname (), ngrp->gr_name); - SYSLOG ((LOG_ERR, "failed to prepare the new %s entry '%s'", gr_dbname (), user_name)); --#ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -- "adding user to group", -- user_name, AUDIT_NO_ID, -- SHADOW_AUDIT_FAILURE); --#endif - fail_exit (E_GRP_UPDATE); - } - #ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -- "adding user to group", -- user_name, AUDIT_NO_ID, -+ audit_logger_with_group (AUDIT_USER_MGMT, Prog, -+ "add-user-to-group", -+ user_name, AUDIT_NO_ID, ngrp->gr_name, - SHADOW_AUDIT_SUCCESS); - #endif - SYSLOG ((LOG_INFO, -@@ -1049,12 +1008,6 @@ static void grp_update (void) - _("%s: Out of memory. Cannot update %s.\n"), - Prog, sgr_dbname ()); - SYSLOG ((LOG_ERR, "failed to prepare the new %s entry '%s'", sgr_dbname (), user_name)); --#ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -- "adding user to shadow group", -- user_name, AUDIT_NO_ID, -- SHADOW_AUDIT_FAILURE); --#endif - fail_exit (E_GRP_UPDATE); /* XXX */ - } - -@@ -1068,18 +1021,13 @@ static void grp_update (void) - _("%s: failed to prepare the new %s entry '%s'\n"), - Prog, sgr_dbname (), nsgrp->sg_name); - SYSLOG ((LOG_ERR, "failed to prepare the new %s entry '%s'", sgr_dbname (), user_name)); --#ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -- "adding user to shadow group", -- user_name, AUDIT_NO_ID, -- SHADOW_AUDIT_FAILURE); --#endif -+ - fail_exit (E_GRP_UPDATE); - } - #ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -- "adding user to shadow group", -- user_name, AUDIT_NO_ID, -+ audit_logger_with_group (AUDIT_USER_MGMT, Prog, -+ "add-to-shadow-group", -+ user_name, AUDIT_NO_ID, nsgrp->sg_name, - SHADOW_AUDIT_SUCCESS); - #endif - SYSLOG ((LOG_INFO, -@@ -1452,7 +1400,7 @@ static void process_flags (int argc, cha - Prog, user_name); - #ifdef WITH_AUDIT - audit_logger (AUDIT_ADD_USER, Prog, -- "adding user", -+ "add-user", - user_name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); - #endif -@@ -1567,7 +1515,7 @@ static void close_files (void) - SYSLOG ((LOG_ERR, "failed to unlock %s", spw_dbname ())); - #ifdef WITH_AUDIT - audit_logger (AUDIT_ADD_USER, Prog, -- "unlocking shadow file", -+ "unlocking-shadow-file", - user_name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); - #endif -@@ -1580,7 +1528,7 @@ static void close_files (void) - SYSLOG ((LOG_ERR, "failed to unlock %s", pw_dbname ())); - #ifdef WITH_AUDIT - audit_logger (AUDIT_ADD_USER, Prog, -- "unlocking passwd file", -+ "unlocking-passwd-file", - user_name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); - #endif -@@ -1622,7 +1570,7 @@ static void close_files (void) - SYSLOG ((LOG_ERR, "failed to unlock %s", sub_uid_dbname ())); - #ifdef WITH_AUDIT - audit_logger (AUDIT_ADD_USER, Prog, -- "unlocking subordinate user file", -+ "unlocking-subordinate-user-file", - user_name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); - #endif -@@ -1636,7 +1584,7 @@ static void close_files (void) - SYSLOG ((LOG_ERR, "failed to unlock %s", sub_gid_dbname ())); - #ifdef WITH_AUDIT - audit_logger (AUDIT_ADD_USER, Prog, -- "unlocking subordinate group file", -+ "unlocking-subordinate-group-file", - user_name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); - #endif -@@ -1828,7 +1776,7 @@ static void grp_add (void) - Prog, gr_dbname (), grp.gr_name); - #ifdef WITH_AUDIT - audit_logger (AUDIT_ADD_GROUP, Prog, -- "adding group", -+ "add-group", - grp.gr_name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); - #endif -@@ -1844,7 +1792,7 @@ static void grp_add (void) - Prog, sgr_dbname (), sgrp.sg_name); - #ifdef WITH_AUDIT - audit_logger (AUDIT_ADD_GROUP, Prog, -- "adding group", -+ "add-group", - grp.gr_name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); - #endif -@@ -1854,7 +1802,7 @@ static void grp_add (void) - SYSLOG ((LOG_INFO, "new group: name=%s, GID=%u", user_name, user_gid)); - #ifdef WITH_AUDIT - audit_logger (AUDIT_ADD_GROUP, Prog, -- "adding group", -+ "add-group", - grp.gr_name, AUDIT_NO_ID, - SHADOW_AUDIT_SUCCESS); - #endif -@@ -2025,12 +1973,6 @@ static void usr_update (void) - fprintf (stderr, - _("%s: failed to prepare the new %s entry '%s'\n"), - Prog, spw_dbname (), spent.sp_namp); --#ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -- "adding shadow password", -- user_name, (unsigned int) user_id, -- SHADOW_AUDIT_FAILURE); --#endif - fail_exit (E_PW_UPDATE); - } - #ifdef ENABLE_SUBIDS -@@ -2051,9 +1993,14 @@ static void usr_update (void) - #endif /* ENABLE_SUBIDS */ - - #ifdef WITH_AUDIT -+ /* -+ * Even though we have the ID of the user, we won't send it now -+ * because its not written to disk yet. After close_files it is -+ * and we can use the real ID thereafter. -+ */ - audit_logger (AUDIT_ADD_USER, Prog, -- "adding user", -- user_name, (unsigned int) user_id, -+ "add-user", -+ user_name, AUDIT_NO_ID, - SHADOW_AUDIT_SUCCESS); - #endif - /* -@@ -2140,12 +2087,6 @@ static void create_home (void) - fprintf (stderr, - _("%s: cannot create directory %s\n"), - Prog, path); --#ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -- "adding home directory", -- user_name, (unsigned int) user_id, -- SHADOW_AUDIT_FAILURE); --#endif - fail_exit (E_HOMEDIR); - } - if (chown (path, 0, 0) < 0) { -@@ -2168,8 +2109,8 @@ static void create_home (void) - } - home_added = true; - #ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -- "adding home directory", -+ audit_logger (AUDIT_USER_MGMT, Prog, -+ "add-home-dir", - user_name, (unsigned int) user_id, - SHADOW_AUDIT_SUCCESS); - #endif -@@ -2354,12 +2295,6 @@ int main (int argc, char **argv) - */ - if (prefix_getpwnam (user_name) != NULL) { /* local, no need for xgetpwnam */ - fprintf (stderr, _("%s: user '%s' already exists\n"), Prog, user_name); --#ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -- "adding user", -- user_name, AUDIT_NO_ID, -- SHADOW_AUDIT_FAILURE); --#endif - fail_exit (E_NAME_IN_USE); - } - -@@ -2375,12 +2310,6 @@ int main (int argc, char **argv) - fprintf (stderr, - _("%s: group %s exists - if you want to add this user to that group, use -g.\n"), - Prog, user_name); --#ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -- "adding group", -- user_name, AUDIT_NO_ID, -- SHADOW_AUDIT_FAILURE); --#endif - fail_exit (E_NAME_IN_USE); - } - } -@@ -2410,12 +2339,6 @@ int main (int argc, char **argv) - fprintf (stderr, - _("%s: UID %lu is not unique\n"), - Prog, (unsigned long) user_id); --#ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -- "adding user", -- user_name, (unsigned int) user_id, -- SHADOW_AUDIT_FAILURE); --#endif - fail_exit (E_UID_IN_USE); - } - } -@@ -2489,9 +2412,10 @@ int main (int argc, char **argv) - _("%s: warning: the user name %s to %s SELinux user mapping failed.\n"), - Prog, user_name, user_selinux); - #ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -- "adding SELinux user mapping", -- user_name, (unsigned int) user_id, 0); -+ audit_logger (AUDIT_ROLE_ASSIGN, Prog, -+ "add-selinux-user-mapping", -+ user_name, (unsigned int) user_id, -+ SHADOW_AUDIT_FAILURE); - #endif /* WITH_AUDIT */ - fail_exit (E_SE_UPDATE); - } -diff -up shadow-4.8.1/src/userdel.c.audit-update shadow-4.8.1/src/userdel.c ---- shadow-4.8.1/src/userdel.c.audit-update 2020-03-17 16:53:44.368943259 +0100 -+++ shadow-4.8.1/src/userdel.c 2020-03-17 16:53:44.373943325 +0100 -@@ -222,9 +222,9 @@ static void update_groups (void) - * Update the DBM group file with the new entry as well. - */ - #ifdef WITH_AUDIT -- audit_logger (AUDIT_DEL_USER, Prog, -- "deleting user from group", -- user_name, (unsigned int) user_id, -+ audit_logger_with_group (AUDIT_USER_MGMT, Prog, -+ "deleting-user-from-group", -+ user_name, (unsigned int) user_id, ngrp->gr_name, - SHADOW_AUDIT_SUCCESS); - #endif /* WITH_AUDIT */ - SYSLOG ((LOG_INFO, "delete '%s' from group '%s'\n", -@@ -284,9 +284,9 @@ static void update_groups (void) - exit (E_GRP_UPDATE); - } - #ifdef WITH_AUDIT -- audit_logger (AUDIT_DEL_USER, Prog, -- "deleting user from shadow group", -- user_name, (unsigned int) user_id, -+ audit_logger_with_group (AUDIT_USER_MGMT, Prog, -+ "deleting-user-from-shadow-group", -+ user_name, (unsigned int) user_id, nsgrp->sg_name, - SHADOW_AUDIT_SUCCESS); - #endif /* WITH_AUDIT */ - SYSLOG ((LOG_INFO, "delete '%s' from shadow group '%s'\n", -@@ -363,9 +363,9 @@ static void remove_usergroup (void) - } - - #ifdef WITH_AUDIT -- audit_logger (AUDIT_DEL_GROUP, Prog, -- "deleting group", -- user_name, AUDIT_NO_ID, -+ audit_logger_with_group (AUDIT_DEL_GROUP, Prog, -+ "delete-group", -+ user_name, AUDIT_NO_ID, user_name, - SHADOW_AUDIT_SUCCESS); - #endif /* WITH_AUDIT */ - SYSLOG ((LOG_INFO, -@@ -381,9 +381,9 @@ static void remove_usergroup (void) - fail_exit (E_GRP_UPDATE); - } - #ifdef WITH_AUDIT -- audit_logger (AUDIT_DEL_GROUP, Prog, -- "deleting shadow group", -- user_name, AUDIT_NO_ID, -+ audit_logger_with_group (AUDIT_GRP_MGMT, Prog, -+ "delete-shadow-group", -+ user_name, AUDIT_NO_ID, user_name, - SHADOW_AUDIT_SUCCESS); - #endif /* WITH_AUDIT */ - SYSLOG ((LOG_INFO, -@@ -545,7 +545,7 @@ static void fail_exit (int code) - - #ifdef WITH_AUDIT - audit_logger (AUDIT_DEL_USER, Prog, -- "deleting user", -+ "delete-user", - user_name, (unsigned int) user_id, - SHADOW_AUDIT_FAILURE); - #endif /* WITH_AUDIT */ -@@ -565,24 +565,12 @@ static void open_files (void) - fprintf (stderr, - _("%s: cannot lock %s; try again later.\n"), - Prog, pw_dbname ()); --#ifdef WITH_AUDIT -- audit_logger (AUDIT_DEL_USER, Prog, -- "locking password file", -- user_name, (unsigned int) user_id, -- SHADOW_AUDIT_FAILURE); --#endif /* WITH_AUDIT */ - fail_exit (E_PW_UPDATE); - } - pw_locked = true; - if (pw_open (O_CREAT | O_RDWR) == 0) { - fprintf (stderr, - _("%s: cannot open %s\n"), Prog, pw_dbname ()); --#ifdef WITH_AUDIT -- audit_logger (AUDIT_DEL_USER, Prog, -- "opening password file", -- user_name, (unsigned int) user_id, -- SHADOW_AUDIT_FAILURE); --#endif /* WITH_AUDIT */ - fail_exit (E_PW_UPDATE); - } - if (is_shadow_pwd) { -@@ -590,12 +578,6 @@ static void open_files (void) - fprintf (stderr, - _("%s: cannot lock %s; try again later.\n"), - Prog, spw_dbname ()); --#ifdef WITH_AUDIT -- audit_logger (AUDIT_DEL_USER, Prog, -- "locking shadow password file", -- user_name, (unsigned int) user_id, -- SHADOW_AUDIT_FAILURE); --#endif /* WITH_AUDIT */ - fail_exit (E_PW_UPDATE); - } - spw_locked = true; -@@ -603,12 +585,6 @@ static void open_files (void) - fprintf (stderr, - _("%s: cannot open %s\n"), - Prog, spw_dbname ()); --#ifdef WITH_AUDIT -- audit_logger (AUDIT_DEL_USER, Prog, -- "opening shadow password file", -- user_name, (unsigned int) user_id, -- SHADOW_AUDIT_FAILURE); --#endif /* WITH_AUDIT */ - fail_exit (E_PW_UPDATE); - } - } -@@ -616,23 +592,11 @@ static void open_files (void) - fprintf (stderr, - _("%s: cannot lock %s; try again later.\n"), - Prog, gr_dbname ()); --#ifdef WITH_AUDIT -- audit_logger (AUDIT_DEL_USER, Prog, -- "locking group file", -- user_name, (unsigned int) user_id, -- SHADOW_AUDIT_FAILURE); --#endif /* WITH_AUDIT */ - fail_exit (E_GRP_UPDATE); - } - gr_locked = true; - if (gr_open (O_CREAT | O_RDWR) == 0) { - fprintf (stderr, _("%s: cannot open %s\n"), Prog, gr_dbname ()); --#ifdef WITH_AUDIT -- audit_logger (AUDIT_DEL_USER, Prog, -- "opening group file", -- user_name, (unsigned int) user_id, -- SHADOW_AUDIT_FAILURE); --#endif /* WITH_AUDIT */ - fail_exit (E_GRP_UPDATE); - } - #ifdef SHADOWGRP -@@ -641,24 +605,12 @@ static void open_files (void) - fprintf (stderr, - _("%s: cannot lock %s; try again later.\n"), - Prog, sgr_dbname ()); --#ifdef WITH_AUDIT -- audit_logger (AUDIT_DEL_USER, Prog, -- "locking shadow group file", -- user_name, (unsigned int) user_id, -- SHADOW_AUDIT_FAILURE); --#endif /* WITH_AUDIT */ - fail_exit (E_GRP_UPDATE); - } - sgr_locked= true; - if (sgr_open (O_CREAT | O_RDWR) == 0) { - fprintf (stderr, _("%s: cannot open %s\n"), - Prog, sgr_dbname ()); --#ifdef WITH_AUDIT -- audit_logger (AUDIT_DEL_USER, Prog, -- "opening shadow group file", -- user_name, (unsigned int) user_id, -- SHADOW_AUDIT_FAILURE); --#endif /* WITH_AUDIT */ - fail_exit (E_GRP_UPDATE); - } - } -@@ -669,24 +621,12 @@ static void open_files (void) - fprintf (stderr, - _("%s: cannot lock %s; try again later.\n"), - Prog, sub_uid_dbname ()); --#ifdef WITH_AUDIT -- audit_logger (AUDIT_DEL_USER, Prog, -- "locking subordinate user file", -- user_name, (unsigned int) user_id, -- SHADOW_AUDIT_FAILURE); --#endif /* WITH_AUDIT */ - fail_exit (E_SUB_UID_UPDATE); - } - sub_uid_locked = true; - if (sub_uid_open (O_CREAT | O_RDWR) == 0) { - fprintf (stderr, - _("%s: cannot open %s\n"), Prog, sub_uid_dbname ()); --#ifdef WITH_AUDIT -- audit_logger (AUDIT_DEL_USER, Prog, -- "opening subordinate user file", -- user_name, (unsigned int) user_id, -- SHADOW_AUDIT_FAILURE); --#endif /* WITH_AUDIT */ - fail_exit (E_SUB_UID_UPDATE); - } - } -@@ -695,24 +635,12 @@ static void open_files (void) - fprintf (stderr, - _("%s: cannot lock %s; try again later.\n"), - Prog, sub_gid_dbname ()); --#ifdef WITH_AUDIT -- audit_logger (AUDIT_DEL_USER, Prog, -- "locking subordinate group file", -- user_name, (unsigned int) user_id, -- SHADOW_AUDIT_FAILURE); --#endif /* WITH_AUDIT */ - fail_exit (E_SUB_GID_UPDATE); - } - sub_gid_locked = true; - if (sub_gid_open (O_CREAT | O_RDWR) == 0) { - fprintf (stderr, - _("%s: cannot open %s\n"), Prog, sub_gid_dbname ()); --#ifdef WITH_AUDIT -- audit_logger (AUDIT_DEL_USER, Prog, -- "opening subordinate group file", -- user_name, (unsigned int) user_id, -- SHADOW_AUDIT_FAILURE); --#endif /* WITH_AUDIT */ - fail_exit (E_SUB_GID_UPDATE); - } - } -@@ -757,7 +685,7 @@ static void update_user (void) - #endif /* ENABLE_SUBIDS */ - #ifdef WITH_AUDIT - audit_logger (AUDIT_DEL_USER, Prog, -- "deleting user entries", -+ "delete-user", - user_name, (unsigned int) user_id, - SHADOW_AUDIT_SUCCESS); - #endif /* WITH_AUDIT */ -@@ -865,7 +793,7 @@ static int remove_mailbox (void) - SYSLOG ((LOG_ERR, "Cannot remove %s: %s", mailfile, strerror (errno))); - #ifdef WITH_AUDIT - audit_logger (AUDIT_DEL_USER, Prog, -- "deleting mail file", -+ "delete-mail-file", - user_name, (unsigned int) user_id, - SHADOW_AUDIT_FAILURE); - #endif /* WITH_AUDIT */ -@@ -882,7 +810,7 @@ static int remove_mailbox (void) - SYSLOG ((LOG_ERR, "Cannot remove %s: %s", mailfile, strerror (errno))); - #ifdef WITH_AUDIT - audit_logger (AUDIT_DEL_USER, Prog, -- "deleting mail file", -+ "delete-mail-file", - user_name, (unsigned int) user_id, - SHADOW_AUDIT_FAILURE); - #endif /* WITH_AUDIT */ -@@ -892,8 +820,8 @@ static int remove_mailbox (void) - #ifdef WITH_AUDIT - else - { -- audit_logger (AUDIT_DEL_USER, Prog, -- "deleting mail file", -+ audit_logger (AUDIT_USER_MGMT, Prog, -+ "delete-mail-file", - user_name, (unsigned int) user_id, - SHADOW_AUDIT_SUCCESS); - } -@@ -911,7 +839,7 @@ static int remove_mailbox (void) - mailfile, strerror (errno))); - #ifdef WITH_AUDIT - audit_logger (AUDIT_DEL_USER, Prog, -- "deleting mail file", -+ "delete-mail-file", - user_name, (unsigned int) user_id, - SHADOW_AUDIT_FAILURE); - #endif /* WITH_AUDIT */ -@@ -928,7 +856,7 @@ static int remove_mailbox (void) - SYSLOG ((LOG_ERR, "Cannot remove %s: %s", mailfile, strerror (errno))); - #ifdef WITH_AUDIT - audit_logger (AUDIT_DEL_USER, Prog, -- "deleting mail file", -+ "delete-mail-file", - user_name, (unsigned int) user_id, - SHADOW_AUDIT_FAILURE); - #endif /* WITH_AUDIT */ -@@ -938,8 +866,8 @@ static int remove_mailbox (void) - #ifdef WITH_AUDIT - else - { -- audit_logger (AUDIT_DEL_USER, Prog, -- "deleting mail file", -+ audit_logger (AUDIT_USER_MGMT, Prog, -+ "delete-mail-file", - user_name, (unsigned int) user_id, - SHADOW_AUDIT_SUCCESS); - } -@@ -1152,7 +1080,7 @@ int main (int argc, char **argv) - Prog, user_name); - #ifdef WITH_AUDIT - audit_logger (AUDIT_DEL_USER, Prog, -- "deleting user not found", -+ "deleting-user-not-found", - user_name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); - #endif /* WITH_AUDIT */ -@@ -1208,7 +1136,7 @@ int main (int argc, char **argv) - if (!fflg) { - #ifdef WITH_AUDIT - audit_logger (AUDIT_DEL_USER, Prog, -- "deleting user logged in", -+ "deleting-user-logged-in", - user_name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); - #endif /* WITH_AUDIT */ -@@ -1302,8 +1230,8 @@ int main (int argc, char **argv) - #ifdef WITH_AUDIT - else - { -- audit_logger (AUDIT_DEL_USER, Prog, -- "deleting home directory", -+ audit_logger (AUDIT_USER_MGMT, Prog, -+ "deleting-home-directory", - user_name, (unsigned int) user_id, - SHADOW_AUDIT_SUCCESS); - } -@@ -1312,7 +1240,7 @@ int main (int argc, char **argv) - #ifdef WITH_AUDIT - if (0 != errors) { - audit_logger (AUDIT_DEL_USER, Prog, -- "deleting home directory", -+ "deleting-home-directory", - user_name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); - } -@@ -1325,8 +1253,8 @@ int main (int argc, char **argv) - _("%s: warning: the user name %s to SELinux user mapping removal failed.\n"), - Prog, user_name); - #ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -- "removing SELinux user mapping", -+ audit_logger (AUDIT_ROLE_REMOVE, Prog, -+ "delete-selinux-user-mapping", - user_name, (unsigned int) user_id, - SHADOW_AUDIT_FAILURE); - #endif /* WITH_AUDIT */ -diff -up shadow-4.8.1/src/usermod.c.audit-update shadow-4.8.1/src/usermod.c ---- shadow-4.8.1/src/usermod.c.audit-update 2020-03-17 16:53:44.370943285 +0100 -+++ shadow-4.8.1/src/usermod.c 2020-03-17 16:53:44.373943325 +0100 -@@ -457,8 +457,8 @@ static char *new_pw_passwd (char *pw_pas - - #ifdef WITH_AUDIT - audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "updating passwd", -- user_newname, (unsigned int) user_newid, 0); -+ "updating-password", -+ user_newname, (unsigned int) user_newid, 1); - #endif - SYSLOG ((LOG_INFO, "lock user '%s' password", user_newname)); - strcpy (buf, "!"); -@@ -477,8 +477,8 @@ static char *new_pw_passwd (char *pw_pas - - #ifdef WITH_AUDIT - audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "updating password", -- user_newname, (unsigned int) user_newid, 0); -+ "updating-password", -+ user_newname, (unsigned int) user_newid, 1); - #endif - SYSLOG ((LOG_INFO, "unlock user '%s' password", user_newname)); - s = pw_pass; -@@ -489,7 +489,7 @@ static char *new_pw_passwd (char *pw_pas - } else if (pflg) { - #ifdef WITH_AUDIT - audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "changing password", -+ "updating-password", - user_newname, (unsigned int) user_newid, 1); - #endif - SYSLOG ((LOG_INFO, "change user '%s' password", user_newname)); -@@ -518,8 +518,8 @@ static void new_pwent (struct passwd *pw - fail_exit (E_NAME_IN_USE); - } - #ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "changing name", -+ audit_logger (AUDIT_USER_MGMT, Prog, -+ "changing-name", - user_newname, (unsigned int) user_newid, 1); - #endif - SYSLOG ((LOG_INFO, -@@ -539,8 +539,8 @@ static void new_pwent (struct passwd *pw - - if (uflg) { - #ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "changing uid", -+ audit_logger (AUDIT_USER_MGMT, Prog, -+ "changing-uid", - user_newname, (unsigned int) user_newid, 1); - #endif - SYSLOG ((LOG_INFO, -@@ -550,8 +550,8 @@ static void new_pwent (struct passwd *pw - } - if (gflg) { - #ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "changing primary group", -+ audit_logger (AUDIT_USER_MGMT, Prog, -+ "changing-primary-group", - user_newname, (unsigned int) user_newid, 1); - #endif - SYSLOG ((LOG_INFO, -@@ -561,8 +561,8 @@ static void new_pwent (struct passwd *pw - } - if (cflg) { - #ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "changing comment", -+ audit_logger (AUDIT_USER_MGMT, Prog, -+ "changing-comment", - user_newname, (unsigned int) user_newid, 1); - #endif - pwent->pw_gecos = user_newcomment; -@@ -570,8 +570,8 @@ static void new_pwent (struct passwd *pw - - if (dflg) { - #ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "changing home directory", -+ audit_logger (AUDIT_USER_MGMT, Prog, -+ "changing-home-dir", - user_newname, (unsigned int) user_newid, 1); - #endif - SYSLOG ((LOG_INFO, -@@ -581,8 +581,8 @@ static void new_pwent (struct passwd *pw - } - if (sflg) { - #ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "changing user shell", -+ audit_logger (AUDIT_USER_MGMT, Prog, -+ "changing-shell", - user_newname, (unsigned int) user_newid, 1); - #endif - SYSLOG ((LOG_INFO, -@@ -612,8 +612,8 @@ static void new_spent (struct spwd *spen - - if (fflg) { - #ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "changing inactive days", -+ audit_logger (AUDIT_USER_MGMT, Prog, -+ "changing-inactive-days", - user_newname, (unsigned int) user_newid, 1); - #endif - SYSLOG ((LOG_INFO, -@@ -629,8 +629,8 @@ static void new_spent (struct spwd *spen - date_to_str (old_exp, sizeof(old_exp), - user_expire * DAY); - #ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "changing expiration date", -+ audit_logger (AUDIT_USER_MGMT, Prog, -+ "changing-expiration-date", - user_newname, (unsigned int) user_newid, 1); - #endif - SYSLOG ((LOG_INFO, -@@ -713,9 +713,9 @@ static /*@noreturn@*/void fail_exit (int - #endif /* ENABLE_SUBIDS */ - - #ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "modifying account", -- user_name, AUDIT_NO_ID, 0); -+ audit_logger (AUDIT_USER_MGMT, Prog, -+ "modify-account", -+ user_name, AUDIT_NO_ID, SHADOW_AUDIT_FAILURE); - #endif - exit (code); - } -@@ -769,9 +769,12 @@ static void update_group (void) - user_newname); - changed = true; - #ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "changing group member", -- user_newname, AUDIT_NO_ID, 1); -+ audit_logger_with_group ( -+ AUDIT_USER_MGMT, Prog, -+ "update-member-in-group", -+ user_newname, AUDIT_NO_ID, -+ ngrp->gr_name, -+ SHADOW_AUDIT_SUCCESS); - #endif - SYSLOG ((LOG_INFO, - "change '%s' to '%s' in group '%s'", -@@ -785,9 +788,11 @@ static void update_group (void) - ngrp->gr_mem = del_list (ngrp->gr_mem, user_name); - changed = true; - #ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "removing group member", -- user_name, AUDIT_NO_ID, 1); -+ audit_logger_with_group (AUDIT_USER_MGMT, Prog, -+ "delete-user-from-group", -+ user_name, AUDIT_NO_ID, -+ ngrp->gr_name, -+ SHADOW_AUDIT_SUCCESS); - #endif - SYSLOG ((LOG_INFO, - "delete '%s' from group '%s'", -@@ -800,9 +805,11 @@ static void update_group (void) - ngrp->gr_mem = add_list (ngrp->gr_mem, user_newname); - changed = true; - #ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "adding user to group", -- user_name, AUDIT_NO_ID, 1); -+ audit_logger_with_group (AUDIT_USER_MGMT, Prog, -+ "add-user-to-group", -+ user_name, AUDIT_NO_ID, -+ ngrp->gr_name, -+ SHADOW_AUDIT_SUCCESS); - #endif - SYSLOG ((LOG_INFO, "add '%s' to group '%s'", - user_newname, ngrp->gr_name)); -@@ -877,9 +884,10 @@ static void update_gshadow (void) - nsgrp->sg_adm = add_list (nsgrp->sg_adm, user_newname); - changed = true; - #ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "changing admin name in shadow group", -- user_name, AUDIT_NO_ID, 1); -+ audit_logger_with_group (AUDIT_GRP_MGMT, Prog, -+ "update-admin-name-in-shadow-group", -+ user_name, AUDIT_NO_ID, nsgrp->sg_name, -+ SHADOW_AUDIT_SUCCESS); - #endif - SYSLOG ((LOG_INFO, - "change admin '%s' to '%s' in shadow group '%s'", -@@ -899,9 +907,10 @@ static void update_gshadow (void) - user_newname); - changed = true; - #ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "changing member in shadow group", -- user_name, AUDIT_NO_ID, 1); -+ audit_logger_with_group (AUDIT_USER_MGMT, Prog, -+ "update-member-in-shadow-group", -+ user_name, AUDIT_NO_ID, -+ nsgrp->sg_name, 1); - #endif - SYSLOG ((LOG_INFO, - "change '%s' to '%s' in shadow group '%s'", -@@ -915,9 +924,10 @@ static void update_gshadow (void) - nsgrp->sg_mem = del_list (nsgrp->sg_mem, user_name); - changed = true; - #ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "removing user from shadow group", -- user_name, AUDIT_NO_ID, 1); -+ audit_logger_with_group (AUDIT_USER_MGMT, Prog, -+ "delete-user-from-shadow-group", -+ user_name, AUDIT_NO_ID, -+ nsgrp->sg_name, 1); - #endif - SYSLOG ((LOG_INFO, - "delete '%s' from shadow group '%s'", -@@ -930,9 +940,10 @@ static void update_gshadow (void) - nsgrp->sg_mem = add_list (nsgrp->sg_mem, user_newname); - changed = true; - #ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "adding user to shadow group", -- user_newname, AUDIT_NO_ID, 1); -+ audit_logger_with_group (AUDIT_USER_MGMT, Prog, -+ "add-user-to-shadow-group", -+ user_newname, AUDIT_NO_ID, -+ nsgrp->sg_name, 1); - #endif - SYSLOG ((LOG_INFO, "add '%s' to shadow group '%s'", - user_newname, nsgrp->sg_name)); -@@ -1799,8 +1810,8 @@ static void move_home (void) - - #ifdef WITH_AUDIT - if (uflg || gflg) { -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "changing home directory owner", -+ audit_logger (AUDIT_USER_MGMT, Prog, -+ "updating-home-dir-owner", - user_newname, (unsigned int) user_newid, 1); - } - #endif -@@ -1818,8 +1829,8 @@ static void move_home (void) - fail_exit (E_HOMEDIR); - } - #ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "moving home directory", -+ audit_logger (AUDIT_USER_MGMT, Prog, -+ "moving-home-dir", - user_newname, (unsigned int) user_newid, - 1); - #endif -@@ -1847,9 +1858,9 @@ static void move_home (void) - Prog, prefix_user_home); - } - #ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_CHAUTHTOK, -+ audit_logger (AUDIT_USER_MGMT, - Prog, -- "moving home directory", -+ "moving-home-dir", - user_newname, - (unsigned int) user_newid, - 1); -@@ -2071,8 +2082,8 @@ static void move_mailbox (void) - } - #ifdef WITH_AUDIT - else { -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "changing mail file owner", -+ audit_logger (AUDIT_USER_MGMT, Prog, -+ "updating-mail-file-owner", - user_newname, (unsigned int) user_newid, 1); - } - #endif -@@ -2098,8 +2109,8 @@ static void move_mailbox (void) - } - #ifdef WITH_AUDIT - else { -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "changing mail file name", -+ audit_logger (AUDIT_USER_MGMT, Prog, -+ "updating-mail-file-name", - user_newname, (unsigned int) user_newid, 1); - } - #endif -@@ -2294,8 +2305,8 @@ int main (int argc, char **argv) - _("%s: warning: the user name %s to %s SELinux user mapping failed.\n"), - Prog, user_name, user_selinux); - #ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "modifying User mapping ", -+ audit_logger (AUDIT_ROLE_ASSIGN, Prog, -+ "changing-selinux-user-mapping ", - user_name, (unsigned int) user_id, - SHADOW_AUDIT_FAILURE); - #endif /* WITH_AUDIT */ -@@ -2307,8 +2318,8 @@ int main (int argc, char **argv) - _("%s: warning: the user name %s to SELinux user mapping removal failed.\n"), - Prog, user_name); - #ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -- "removing SELinux user mapping", -+ audit_logger (AUDIT_ROLE_REMOVE, Prog, -+ "delete-selinux-user-mapping", - user_name, (unsigned int) user_id, - SHADOW_AUDIT_FAILURE); - #endif /* WITH_AUDIT */ -@@ -2349,8 +2360,8 @@ int main (int argc, char **argv) - */ - #ifdef WITH_AUDIT - if (uflg || gflg) { -- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -- "changing home directory owner", -+ audit_logger (AUDIT_USER_MGMT, Prog, -+ "updating-home-dir-owner", - user_newname, (unsigned int) user_newid, 1); - } - #endif diff --git a/shadow-4.9-default-range.patch b/shadow-4.9-default-range.patch deleted file mode 100644 index f6e0427..0000000 --- a/shadow-4.9-default-range.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -up shadow-4.9/lib/semanage.c.default-range shadow-4.9/lib/semanage.c ---- shadow-4.9/lib/semanage.c.default-range 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/lib/semanage.c 2021-08-02 12:43:16.822817392 +0200 -@@ -143,6 +143,7 @@ static int semanage_user_mod (semanage_h - goto done; - } - -+#if 0 - ret = semanage_seuser_set_mlsrange (handle, seuser, DEFAULT_SERANGE); - if (ret != 0) { - fprintf (shadow_logfd, -@@ -150,6 +151,7 @@ static int semanage_user_mod (semanage_h - ret = 1; - goto done; - } -+#endif - - ret = semanage_seuser_set_sename (handle, seuser, seuser_name); - if (ret != 0) { -@@ -200,6 +202,7 @@ static int semanage_user_add (semanage_h - goto done; - } - -+#if 0 - ret = semanage_seuser_set_mlsrange (handle, seuser, DEFAULT_SERANGE); - if (ret != 0) { - fprintf (shadow_logfd, -@@ -208,6 +211,7 @@ static int semanage_user_add (semanage_h - ret = 1; - goto done; - } -+#endif - - ret = semanage_seuser_set_sename (handle, seuser, seuser_name); - if (ret != 0) { diff --git a/shadow-4.9-getsubids.patch b/shadow-4.9-getsubids.patch deleted file mode 100644 index b9f2449..0000000 --- a/shadow-4.9-getsubids.patch +++ /dev/null @@ -1,245 +0,0 @@ -diff -up shadow-4.9/man/getsubids.1.xml.getsubids shadow-4.9/man/getsubids.1.xml ---- shadow-4.9/man/getsubids.1.xml.getsubids 2021-11-18 16:27:33.951053120 +0100 -+++ shadow-4.9/man/getsubids.1.xml 2021-11-18 16:27:33.951053120 +0100 -@@ -0,0 +1,141 @@ -+ -+ -+ -+]> -+ -+ -+ -+ -+ Iker -+ Pedrosa -+ Creation, 2021 -+ -+ -+ -+ getsubids -+ 1 -+ User Commands -+ shadow-utils -+ &SHADOW_UTILS_VERSION; -+ -+ -+ getsubids -+ get the subordinate id ranges for a user -+ -+ -+ -+ -+ getsubids -+ -+ options -+ -+ -+ USER -+ -+ -+ -+ -+ -+ DESCRIPTION -+ -+ The getsubids command lists the subordinate user ID -+ ranges for a given user. The subordinate group IDs can be listed using -+ the option. -+ -+ -+ -+ -+ OPTIONS -+ -+ The options which apply to the getsubids command are: -+ -+ -+ -+ -+ -+ -+ -+ -+ List the subordinate group ID ranges. -+ -+ -+ -+ -+ -+ -+ -+ EXAMPLE -+ -+ For example, to obtain the subordinate UIDs of the testuser: -+ -+ -+ -+$ getsubids testuser -+0: testuser 100000 65536 -+ -+ -+ -+ This command output provides (in order from left to right) the list -+ index, username, UID range start, and number of UIDs in range. -+ -+ -+ -+ -+ SEE ALSO -+ -+ -+ login.defs5 -+ , -+ -+ newgidmap1 -+ , -+ -+ newuidmap1 -+ , -+ -+ subgid5 -+ , -+ -+ subuid5 -+ , -+ -+ useradd8 -+ , -+ -+ userdel8 -+ . -+ -+ usermod8 -+ , -+ -+ -+ -diff -up shadow-4.9/man/Makefile.am.getsubids shadow-4.9/man/Makefile.am ---- shadow-4.9/man/Makefile.am.getsubids 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/man/Makefile.am 2021-11-18 16:27:33.951053120 +0100 -@@ -62,6 +62,7 @@ man_MANS += $(man_nopam) - endif - - man_subids = \ -+ man1/getsubids.1 \ - man1/newgidmap.1 \ - man1/newuidmap.1 \ - man5/subgid.5 \ -@@ -80,6 +81,7 @@ man_XMANS = \ - expiry.1.xml \ - faillog.5.xml \ - faillog.8.xml \ -+ getsubids.1.xml \ - gpasswd.1.xml \ - groupadd.8.xml \ - groupdel.8.xml \ -diff -up shadow-4.9/src/getsubids.c.getsubids shadow-4.9/src/getsubids.c ---- shadow-4.9/src/getsubids.c.getsubids 2021-11-18 16:27:33.951053120 +0100 -+++ shadow-4.9/src/getsubids.c 2021-11-18 16:27:33.951053120 +0100 -@@ -0,0 +1,46 @@ -+#include -+#include -+#include -+#include "subid.h" -+#include "prototypes.h" -+ -+const char *Prog; -+FILE *shadow_logfd = NULL; -+ -+void usage(void) -+{ -+ fprintf(stderr, "Usage: %s [-g] user\n", Prog); -+ fprintf(stderr, " list subuid ranges for user\n"); -+ fprintf(stderr, " pass -g to list subgid ranges\n"); -+ exit(EXIT_FAILURE); -+} -+ -+int main(int argc, char *argv[]) -+{ -+ int i, count=0; -+ struct subid_range *ranges; -+ const char *owner; -+ -+ Prog = Basename (argv[0]); -+ shadow_logfd = stderr; -+ if (argc < 2) -+ usage(); -+ owner = argv[1]; -+ if (argc == 3 && strcmp(argv[1], "-g") == 0) { -+ owner = argv[2]; -+ count = get_subgid_ranges(owner, &ranges); -+ } else if (argc == 2 && strcmp(argv[1], "-h") == 0) { -+ usage(); -+ } else { -+ count = get_subuid_ranges(owner, &ranges); -+ } -+ if (!ranges) { -+ fprintf(stderr, "Error fetching ranges\n"); -+ exit(1); -+ } -+ for (i = 0; i < count; i++) { -+ printf("%d: %s %lu %lu\n", i, owner, -+ ranges[i].start, ranges[i].count); -+ } -+ return 0; -+} -diff -up shadow-4.9/src/list_subid_ranges.c.getsubids shadow-4.9/src/list_subid_ranges.c -diff -up shadow-4.9/src/Makefile.am.getsubids shadow-4.9/src/Makefile.am ---- shadow-4.9/src/Makefile.am.getsubids 2021-11-18 16:27:33.943053061 +0100 -+++ shadow-4.9/src/Makefile.am 2021-11-18 16:28:03.647272392 +0100 -@@ -157,8 +157,8 @@ if FCAPS - setcap cap_setgid+ep $(DESTDIR)$(ubindir)/newgidmap - endif - --noinst_PROGRAMS += list_subid_ranges \ -- get_subid_owners \ -+bin_PROGRAMS += getsubids -+noinst_PROGRAMS += get_subid_owners \ - new_subid_range \ - free_subid_range \ - check_subid_range -@@ -174,13 +174,13 @@ MISCLIBS = \ - $(LIBCRYPT) \ - $(LIBTCB) - --list_subid_ranges_LDADD = \ -+getsubids_LDADD = \ - $(top_builddir)/lib/libshadow.la \ - $(top_builddir)/libmisc/libmisc.la \ - $(top_builddir)/libsubid/libsubid.la \ - $(MISCLIBS) -ldl - --list_subid_ranges_CPPFLAGS = \ -+getsubids_CPPFLAGS = \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/libmisc \ - -I$(top_srcdir)/libsubid diff --git a/shadow-4.9-groupdel-fix-sigsegv-when-passwd-does-not-exist.patch b/shadow-4.9-groupdel-fix-sigsegv-when-passwd-does-not-exist.patch deleted file mode 100644 index 658156a..0000000 --- a/shadow-4.9-groupdel-fix-sigsegv-when-passwd-does-not-exist.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up shadow-4.9/libmisc/prefix_flag.c.groupdel-fix-sigsegv-when-passwd-does-not-exist shadow-4.9/libmisc/prefix_flag.c ---- shadow-4.9/libmisc/prefix_flag.c.groupdel-fix-sigsegv-when-passwd-does-not-exist 2021-11-19 09:21:36.997091941 +0100 -+++ shadow-4.9/libmisc/prefix_flag.c 2021-11-19 09:22:19.001341010 +0100 -@@ -288,6 +288,9 @@ extern struct passwd* prefix_getpwent() - if(!passwd_db_file) { - return getpwent(); - } -+ if (!fp_pwent) { -+ return NULL; -+ } - return fgetpwent(fp_pwent); - } - extern void prefix_endpwent() diff --git a/shadow-4.9-libmisc-fix-default-value-in-SHA_get_salt_rounds.patch b/shadow-4.9-libmisc-fix-default-value-in-SHA_get_salt_rounds.patch deleted file mode 100644 index 5eaaec9..0000000 --- a/shadow-4.9-libmisc-fix-default-value-in-SHA_get_salt_rounds.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 234e8fa7b134d1ebabfdad980a3ae5b63c046c62 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Sat, 14 Aug 2021 13:24:34 -0400 -Subject: [PATCH] libmisc: fix default value in SHA_get_salt_rounds() - -If SHA_CRYPT_MIN_ROUNDS and SHA_CRYPT_MAX_ROUNDS are both unspecified, -use SHA_ROUNDS_DEFAULT. - -Previously, the code fell through, calling shadow_random(-1, -1). This -ultimately set rounds = (unsigned long) -1, which ends up being a very -large number! This then got capped to SHA_ROUNDS_MAX later in the -function. - -The new behavior matches BCRYPT_get_salt_rounds(). - -Bug: https://bugs.gentoo.org/808195 -Fixes: https://github.com/shadow-maint/shadow/issues/393 ---- - libmisc/salt.c | 21 +++++++++++---------- - 1 file changed, 11 insertions(+), 10 deletions(-) - -diff --git a/libmisc/salt.c b/libmisc/salt.c -index 91d528fd..30eefb9c 100644 ---- a/libmisc/salt.c -+++ b/libmisc/salt.c -@@ -223,20 +223,21 @@ static /*@observer@*/const unsigned long SHA_get_salt_rounds (/*@null@*/int *pre - if ((-1 == min_rounds) && (-1 == max_rounds)) { - rounds = SHA_ROUNDS_DEFAULT; - } -+ else { -+ if (-1 == min_rounds) { -+ min_rounds = max_rounds; -+ } - -- if (-1 == min_rounds) { -- min_rounds = max_rounds; -- } -+ if (-1 == max_rounds) { -+ max_rounds = min_rounds; -+ } - -- if (-1 == max_rounds) { -- max_rounds = min_rounds; -- } -+ if (min_rounds > max_rounds) { -+ max_rounds = min_rounds; -+ } - -- if (min_rounds > max_rounds) { -- max_rounds = min_rounds; -+ rounds = (unsigned long) shadow_random (min_rounds, max_rounds); - } -- -- rounds = (unsigned long) shadow_random (min_rounds, max_rounds); - } else if (0 == *prefered_rounds) { - rounds = SHA_ROUNDS_DEFAULT; - } else { --- -2.31.1 - diff --git a/shadow-4.9-make-shadow-logfd-and-prog-not-extern.patch b/shadow-4.9-make-shadow-logfd-and-prog-not-extern.patch deleted file mode 100644 index d0b7059..0000000 --- a/shadow-4.9-make-shadow-logfd-and-prog-not-extern.patch +++ /dev/null @@ -1,2497 +0,0 @@ -diff -up shadow-4.9/lib/commonio.c.debug1 shadow-4.9/lib/commonio.c ---- shadow-4.9/lib/commonio.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/lib/commonio.c 2022-01-10 10:45:52.202132937 +0100 -@@ -51,6 +51,7 @@ - #endif /* WITH_TCB */ - #include "prototypes.h" - #include "commonio.h" -+#include "shadowlog_internal.h" - - /* local function prototypes */ - static int lrename (const char *, const char *); -diff -up shadow-4.9/lib/encrypt.c.debug1 shadow-4.9/lib/encrypt.c ---- shadow-4.9/lib/encrypt.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/lib/encrypt.c 2022-01-10 10:45:52.202132937 +0100 -@@ -39,6 +39,7 @@ - - #include "prototypes.h" - #include "defines.h" -+#include "shadowlog_internal.h" - - /*@exposed@*//*@null@*/char *pw_encrypt (const char *clear, const char *salt) - { -diff -up shadow-4.9/lib/getdef.c.debug1 shadow-4.9/lib/getdef.c ---- shadow-4.9/lib/getdef.c.debug1 2022-01-10 10:45:52.191132858 +0100 -+++ shadow-4.9/lib/getdef.c 2022-01-10 10:45:52.202132937 +0100 -@@ -44,6 +44,7 @@ - #include - #endif - #include "getdef.h" -+#include "shadowlog_internal.h" - /* - * A configuration item definition. - */ -diff -up shadow-4.9/lib/Makefile.am.debug1 shadow-4.9/lib/Makefile.am ---- shadow-4.9/lib/Makefile.am.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/lib/Makefile.am 2022-01-10 10:45:52.202132937 +0100 -@@ -34,6 +34,8 @@ libshadow_la_SOURCES = \ - nss.c \ - nscd.c \ - nscd.h \ -+ shadowlog.c \ -+ shadowlog.h \ - sssd.c \ - sssd.h \ - pam_defs.h \ -diff -up shadow-4.9/libmisc/addgrps.c.debug1 shadow-4.9/libmisc/addgrps.c ---- shadow-4.9/libmisc/addgrps.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/libmisc/addgrps.c 2022-01-10 10:45:52.203132944 +0100 -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include "shadowlog.h" - - #ident "$Id$" - -@@ -58,6 +59,7 @@ int add_groups (const char *list) - char *token; - char buf[1024]; - int ret; -+ FILE *shadow_logfd = log_get_logfd(); - - if (strlen (list) >= sizeof (buf)) { - errno = EINVAL; -diff -up shadow-4.9/libmisc/audit_help.c.debug1 shadow-4.9/libmisc/audit_help.c ---- shadow-4.9/libmisc/audit_help.c.debug1 2022-01-10 10:45:52.184132808 +0100 -+++ shadow-4.9/libmisc/audit_help.c 2022-01-10 10:45:52.203132944 +0100 -@@ -45,6 +45,7 @@ - #include - #include - #include "prototypes.h" -+#include "shadowlog.h" - int audit_fd; - - void audit_help_open (void) -@@ -59,7 +60,7 @@ void audit_help_open (void) - return; - } - (void) fputs (_("Cannot open audit interface - aborting.\n"), -- shadow_logfd); -+ log_get_logfd()); - exit (EXIT_FAILURE); - } - } -diff -up shadow-4.9/libmisc/chowntty.c.debug1 shadow-4.9/libmisc/chowntty.c ---- shadow-4.9/libmisc/chowntty.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/libmisc/chowntty.c 2022-01-10 10:45:52.203132944 +0100 -@@ -43,6 +43,7 @@ - #include "defines.h" - #include - #include "getdef.h" -+#include "shadowlog.h" - - /* - * chown_tty() sets the login tty to be owned by the new user ID -@@ -75,6 +76,7 @@ void chown_tty (const struct passwd *inf - if ( (fchown (STDIN_FILENO, info->pw_uid, gid) != 0) - || (fchmod (STDIN_FILENO, (mode_t)getdef_num ("TTYPERM", 0600)) != 0)) { - int err = errno; -+ FILE *shadow_logfd = log_get_logfd(); - - fprintf (shadow_logfd, - _("Unable to change owner or mode of tty stdin: %s"), -diff -up shadow-4.9/libmisc/cleanup_group.c.debug1 shadow-4.9/libmisc/cleanup_group.c ---- shadow-4.9/libmisc/cleanup_group.c.debug1 2022-01-10 10:45:52.184132808 +0100 -+++ shadow-4.9/libmisc/cleanup_group.c 2022-01-10 10:47:02.241632844 +0100 -@@ -36,6 +36,7 @@ - #include "groupio.h" - #include "sgroupio.h" - #include "prototypes.h" -+#include "shadowlog.h" - - /* - * cleanup_report_add_group - Report failure to add a group to the system -@@ -48,7 +49,7 @@ void cleanup_report_add_group (void *gro - - SYSLOG ((LOG_ERR, "failed to add group %s", name)); - #ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_GROUP, Prog, -+ audit_logger (AUDIT_ADD_GROUP, log_get_progname(), - "", - name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); -@@ -66,7 +67,7 @@ void cleanup_report_del_group (void *gro - - SYSLOG ((LOG_ERR, "failed to remove group %s", name)); - #ifdef WITH_AUDIT -- audit_logger (AUDIT_DEL_GROUP, Prog, -+ audit_logger (AUDIT_DEL_GROUP, log_get_progname(), - "", - name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); -@@ -83,7 +84,7 @@ void cleanup_report_mod_group (void *cle - gr_dbname (), - info->action)); - #ifdef WITH_AUDIT -- audit_logger (AUDIT_GRP_MGMT, Prog, -+ audit_logger (AUDIT_GRP_MGMT, log_get_progname(), - info->audit_msg, - info->name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); -@@ -101,7 +102,7 @@ void cleanup_report_mod_gshadow (void *c - sgr_dbname (), - info->action)); - #ifdef WITH_AUDIT -- audit_logger (AUDIT_GRP_MGMT, Prog, -+ audit_logger (AUDIT_GRP_MGMT, log_get_progname(), - info->audit_msg, - info->name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); -@@ -121,7 +122,7 @@ void cleanup_report_add_group_group (voi - - SYSLOG ((LOG_ERR, "failed to add group %s to %s", name, gr_dbname ())); - #ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_GROUP, Prog, -+ audit_logger (AUDIT_ADD_GROUP, log_get_progname(), - "adding-group", - name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); -@@ -141,7 +142,7 @@ void cleanup_report_add_group_gshadow (v - - SYSLOG ((LOG_ERR, "failed to add group %s to %s", name, sgr_dbname ())); - #ifdef WITH_AUDIT -- audit_logger (AUDIT_GRP_MGMT, Prog, -+ audit_logger (AUDIT_GRP_MGMT, log_get_progname(), - "adding-shadow-group", - name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); -@@ -164,7 +165,7 @@ void cleanup_report_del_group_group (voi - "failed to remove group %s from %s", - name, gr_dbname ())); - #ifdef WITH_AUDIT -- audit_logger (AUDIT_DEL_GROUP, Prog, -+ audit_logger (AUDIT_DEL_GROUP, log_get_progname(), - "removing-group", - name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); -@@ -187,7 +188,7 @@ void cleanup_report_del_group_gshadow (v - "failed to remove group %s from %s", - name, sgr_dbname ())); - #ifdef WITH_AUDIT -- audit_logger (AUDIT_GRP_MGMT, Prog, -+ audit_logger (AUDIT_GRP_MGMT, log_get_progname(), - "removing-shadow-group", - name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); -@@ -203,9 +204,9 @@ void cleanup_report_del_group_gshadow (v - void cleanup_unlock_group (unused void *arg) - { - if (gr_unlock () == 0) { -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: failed to unlock %s\n"), -- Prog, gr_dbname ()); -+ log_get_progname(), gr_dbname ()); - SYSLOG ((LOG_ERR, "failed to unlock %s", gr_dbname ())); - #ifdef WITH_AUDIT - audit_logger_message ("unlocking-group", -@@ -223,9 +224,9 @@ void cleanup_unlock_group (unused void * - void cleanup_unlock_gshadow (unused void *arg) - { - if (sgr_unlock () == 0) { -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: failed to unlock %s\n"), -- Prog, sgr_dbname ()); -+ log_get_progname(), sgr_dbname ()); - SYSLOG ((LOG_ERR, "failed to unlock %s", sgr_dbname ())); - #ifdef WITH_AUDIT - audit_logger_message ("unlocking-gshadow", -diff -up shadow-4.9/libmisc/cleanup_user.c.debug1 shadow-4.9/libmisc/cleanup_user.c ---- shadow-4.9/libmisc/cleanup_user.c.debug1 2022-01-10 10:45:52.184132808 +0100 -+++ shadow-4.9/libmisc/cleanup_user.c 2022-01-10 10:47:49.539970421 +0100 -@@ -36,6 +36,7 @@ - #include "pwio.h" - #include "shadowio.h" - #include "prototypes.h" -+#include "shadowlog.h" - - /* - * cleanup_report_add_user - Report failure to add an user to the system -@@ -48,7 +49,7 @@ void cleanup_report_add_user (void *user - - SYSLOG ((LOG_ERR, "failed to add user %s", name)); - #ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -+ audit_logger (AUDIT_ADD_USER, log_get_progname(), - "", - name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); -@@ -65,7 +66,7 @@ void cleanup_report_mod_passwd (void *cl - pw_dbname (), - info->action)); - #ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_MGMT, Prog, -+ audit_logger (AUDIT_USER_MGMT, log_get_progname(), - info->audit_msg, - info->name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); -@@ -85,7 +86,7 @@ void cleanup_report_add_user_passwd (voi - - SYSLOG ((LOG_ERR, "failed to add user %s to %s", name, pw_dbname ())); - #ifdef WITH_AUDIT -- audit_logger (AUDIT_ADD_USER, Prog, -+ audit_logger (AUDIT_ADD_USER, log_get_progname(), - "adding-user", - name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); -@@ -105,7 +106,7 @@ void cleanup_report_add_user_shadow (voi - - SYSLOG ((LOG_ERR, "failed to add user %s to %s", name, spw_dbname ())); - #ifdef WITH_AUDIT -- audit_logger (AUDIT_USER_MGMT, Prog, -+ audit_logger (AUDIT_USER_MGMT, log_get_progname(), - "adding-shadow-user", - name, AUDIT_NO_ID, - SHADOW_AUDIT_FAILURE); -@@ -120,9 +121,9 @@ void cleanup_report_add_user_shadow (voi - void cleanup_unlock_passwd (unused void *arg) - { - if (pw_unlock () == 0) { -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: failed to unlock %s\n"), -- Prog, pw_dbname ()); -+ log_get_progname(), pw_dbname ()); - SYSLOG ((LOG_ERR, "failed to unlock %s", pw_dbname ())); - #ifdef WITH_AUDIT - audit_logger_message ("unlocking-passwd", -@@ -139,9 +140,9 @@ void cleanup_unlock_passwd (unused void - void cleanup_unlock_shadow (unused void *arg) - { - if (spw_unlock () == 0) { -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: failed to unlock %s\n"), -- Prog, spw_dbname ()); -+ log_get_progname(), spw_dbname ()); - SYSLOG ((LOG_ERR, "failed to unlock %s", spw_dbname ())); - #ifdef WITH_AUDIT - audit_logger_message ("unlocking-shadow", -diff -up shadow-4.9/libmisc/copydir.c.debug1 shadow-4.9/libmisc/copydir.c ---- shadow-4.9/libmisc/copydir.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/libmisc/copydir.c 2022-01-10 10:48:02.158060482 +0100 -@@ -55,6 +55,7 @@ - #ifdef WITH_ATTR - #include - #endif /* WITH_ATTR */ -+#include "shadowlog.h" - - - static /*@null@*/const char *src_orig; -@@ -116,6 +117,7 @@ static int fchown_if_needed (int fdst, c - static void error_acl (struct error_context *ctx, const char *fmt, ...) - { - va_list ap; -+ FILE *shadow_logfd = log_get_logfd(); - - /* ignore the case when destination does not support ACLs - * or extended attributes */ -@@ -125,7 +127,7 @@ static void error_acl (struct error_cont - } - - va_start (ap, fmt); -- (void) fprintf (shadow_logfd, _("%s: "), Prog); -+ (void) fprintf (shadow_logfd, _("%s: "), log_get_progname()); - if (vfprintf (shadow_logfd, fmt, ap) != 0) { - (void) fputs (_(": "), shadow_logfd); - } -@@ -248,9 +250,9 @@ int copy_tree (const char *src_root, con - } - - if (!S_ISDIR (sb.st_mode)) { -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - "%s: %s is not a directory", -- Prog, src_root); -+ log_get_progname(), src_root); - return -1; - } - -diff -up shadow-4.9/libmisc/env.c.debug1 shadow-4.9/libmisc/env.c ---- shadow-4.9/libmisc/env.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/libmisc/env.c 2022-01-10 10:45:52.203132944 +0100 -@@ -40,6 +40,7 @@ - #include - #include "prototypes.h" - #include "defines.h" -+#include "shadowlog.h" - /* - * NEWENVP_STEP must be a power of two. This is the number - * of (char *) pointers to allocate at a time, to avoid using -@@ -171,7 +172,7 @@ void addenv (const char *string, /*@null - } - newenvp = __newenvp; - } else { -- (void) fputs (_("Environment overflow\n"), shadow_logfd); -+ (void) fputs (_("Environment overflow\n"), log_get_logfd()); - newenvc--; - free (newenvp[newenvc]); - } -diff -up shadow-4.9/libmisc/find_new_gid.c.debug1 shadow-4.9/libmisc/find_new_gid.c ---- shadow-4.9/libmisc/find_new_gid.c.debug1 2022-01-10 10:45:52.191132858 +0100 -+++ shadow-4.9/libmisc/find_new_gid.c 2022-01-10 10:45:52.203132944 +0100 -@@ -38,6 +38,7 @@ - #include "prototypes.h" - #include "groupio.h" - #include "getdef.h" -+#include "shadowlog.h" - - /* - * get_ranges - Get the minimum and maximum ID ranges for the search -@@ -74,10 +75,10 @@ static int get_ranges (bool sys_group, g - - /* Check that the ranges make sense */ - if (*max_id < *min_id) { -- (void) fprintf (shadow_logfd, -+ (void) fprintf (log_get_logfd(), - _("%s: Invalid configuration: SYS_GID_MIN (%lu), " - "GID_MIN (%lu), SYS_GID_MAX (%lu)\n"), -- Prog, (unsigned long) *min_id, -+ log_get_progname(), (unsigned long) *min_id, - getdef_ulong ("GID_MIN", 1000UL), - (unsigned long) *max_id); - return EINVAL; -@@ -104,10 +105,10 @@ static int get_ranges (bool sys_group, g - - /* Check that the ranges make sense */ - if (*max_id < *min_id) { -- (void) fprintf (shadow_logfd, -+ (void) fprintf (log_get_logfd(), - _("%s: Invalid configuration: GID_MIN (%lu), " - "GID_MAX (%lu)\n"), -- Prog, (unsigned long) *min_id, -+ log_get_progname(), (unsigned long) *min_id, - (unsigned long) *max_id); - return EINVAL; - } -@@ -220,10 +221,10 @@ int find_new_gid (bool sys_group, - * more likely to want to stop and address the - * issue. - */ -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: Encountered error attempting to use " - "preferred GID: %s\n"), -- Prog, strerror (result)); -+ log_get_progname(), strerror (result)); - return -1; - } - } -@@ -250,9 +251,9 @@ int find_new_gid (bool sys_group, - /* Create an array to hold all of the discovered GIDs */ - used_gids = malloc (sizeof (bool) * (gid_max +1)); - if (NULL == used_gids) { -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: failed to allocate memory: %s\n"), -- Prog, strerror (errno)); -+ log_get_progname(), strerror (errno)); - return -1; - } - memset (used_gids, false, sizeof (bool) * (gid_max + 1)); -@@ -330,10 +331,10 @@ int find_new_gid (bool sys_group, - * - */ - if (!nospam) { -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: Can't get unique system GID (%s). " - "Suppressing additional messages.\n"), -- Prog, strerror (result)); -+ log_get_progname(), strerror (result)); - SYSLOG ((LOG_ERR, - "Error checking available GIDs: %s", - strerror (result))); -@@ -373,10 +374,10 @@ int find_new_gid (bool sys_group, - * - */ - if (!nospam) { -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: Can't get unique system GID (%s). " - "Suppressing additional messages.\n"), -- Prog, strerror (result)); -+ log_get_progname(), strerror (result)); - SYSLOG ((LOG_ERR, - "Error checking available GIDs: %s", - strerror (result))); -@@ -433,10 +434,10 @@ int find_new_gid (bool sys_group, - * - */ - if (!nospam) { -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: Can't get unique GID (%s). " - "Suppressing additional messages.\n"), -- Prog, strerror (result)); -+ log_get_progname(), strerror (result)); - SYSLOG ((LOG_ERR, - "Error checking available GIDs: %s", - strerror (result))); -@@ -476,10 +477,10 @@ int find_new_gid (bool sys_group, - * - */ - if (!nospam) { -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: Can't get unique GID (%s). " - "Suppressing additional messages.\n"), -- Prog, strerror (result)); -+ log_get_progname(), strerror (result)); - SYSLOG ((LOG_ERR, - "Error checking available GIDs: %s", - strerror (result))); -@@ -495,9 +496,9 @@ int find_new_gid (bool sys_group, - } - - /* The code reached here and found no available IDs in the range */ -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: Can't get unique GID (no more available GIDs)\n"), -- Prog); -+ log_get_progname()); - SYSLOG ((LOG_WARN, "no more available GIDs on the system")); - free (used_gids); - return -1; -diff -up shadow-4.9/libmisc/find_new_sub_gids.c.debug1 shadow-4.9/libmisc/find_new_sub_gids.c ---- shadow-4.9/libmisc/find_new_sub_gids.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/libmisc/find_new_sub_gids.c 2022-01-10 10:45:52.203132944 +0100 -@@ -37,6 +37,7 @@ - #include "prototypes.h" - #include "subordinateio.h" - #include "getdef.h" -+#include "shadowlog.h" - - /* - * find_new_sub_gids - Find a new unused range of GIDs. -@@ -60,18 +61,18 @@ int find_new_sub_gids (gid_t *range_star - count = getdef_ulong ("SUB_GID_COUNT", 65536); - - if (min > max || count >= max || (min + count - 1) > max) { -- (void) fprintf (shadow_logfd, -+ (void) fprintf (log_get_logfd(), - _("%s: Invalid configuration: SUB_GID_MIN (%lu)," - " SUB_GID_MAX (%lu), SUB_GID_COUNT (%lu)\n"), -- Prog, min, max, count); -+ log_get_progname(), min, max, count); - return -1; - } - - start = sub_gid_find_free_range(min, max, count); - if (start == (gid_t)-1) { -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: Can't get unique subordinate GID range\n"), -- Prog); -+ log_get_progname()); - SYSLOG ((LOG_WARN, "no more available subordinate GIDs on the system")); - return -1; - } -diff -up shadow-4.9/libmisc/find_new_sub_uids.c.debug1 shadow-4.9/libmisc/find_new_sub_uids.c ---- shadow-4.9/libmisc/find_new_sub_uids.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/libmisc/find_new_sub_uids.c 2022-01-10 10:45:52.203132944 +0100 -@@ -37,6 +37,7 @@ - #include "prototypes.h" - #include "subordinateio.h" - #include "getdef.h" -+#include "shadowlog.h" - - /* - * find_new_sub_uids - Find a new unused range of UIDs. -@@ -60,18 +61,18 @@ int find_new_sub_uids (uid_t *range_star - count = getdef_ulong ("SUB_UID_COUNT", 65536); - - if (min > max || count >= max || (min + count - 1) > max) { -- (void) fprintf (shadow_logfd, -+ (void) fprintf (log_get_logfd(), - _("%s: Invalid configuration: SUB_UID_MIN (%lu)," - " SUB_UID_MAX (%lu), SUB_UID_COUNT (%lu)\n"), -- Prog, min, max, count); -+ log_get_progname(), min, max, count); - return -1; - } - - start = sub_uid_find_free_range(min, max, count); - if (start == (uid_t)-1) { -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: Can't get unique subordinate UID range\n"), -- Prog); -+ log_get_progname()); - SYSLOG ((LOG_WARN, "no more available subordinate UIDs on the system")); - return -1; - } -diff -up shadow-4.9/libmisc/find_new_uid.c.debug1 shadow-4.9/libmisc/find_new_uid.c ---- shadow-4.9/libmisc/find_new_uid.c.debug1 2022-01-10 10:45:52.191132858 +0100 -+++ shadow-4.9/libmisc/find_new_uid.c 2022-01-10 10:45:52.204132951 +0100 -@@ -38,6 +38,7 @@ - #include "prototypes.h" - #include "pwio.h" - #include "getdef.h" -+#include "shadowlog.h" - - /* - * get_ranges - Get the minimum and maximum ID ranges for the search -@@ -74,10 +75,10 @@ static int get_ranges (bool sys_user, ui - - /* Check that the ranges make sense */ - if (*max_id < *min_id) { -- (void) fprintf (shadow_logfd, -+ (void) fprintf (log_get_logfd(), - _("%s: Invalid configuration: SYS_UID_MIN (%lu), " - "UID_MIN (%lu), SYS_UID_MAX (%lu)\n"), -- Prog, (unsigned long) *min_id, -+ log_get_progname(), (unsigned long) *min_id, - getdef_ulong ("UID_MIN", 1000UL), - (unsigned long) *max_id); - return EINVAL; -@@ -104,10 +105,10 @@ static int get_ranges (bool sys_user, ui - - /* Check that the ranges make sense */ - if (*max_id < *min_id) { -- (void) fprintf (shadow_logfd, -+ (void) fprintf (log_get_logfd(), - _("%s: Invalid configuration: UID_MIN (%lu), " - "UID_MAX (%lu)\n"), -- Prog, (unsigned long) *min_id, -+ log_get_progname(), (unsigned long) *min_id, - (unsigned long) *max_id); - return EINVAL; - } -@@ -220,10 +221,10 @@ int find_new_uid(bool sys_user, - * more likely to want to stop and address the - * issue. - */ -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: Encountered error attempting to use " - "preferred UID: %s\n"), -- Prog, strerror (result)); -+ log_get_progname(), strerror (result)); - return -1; - } - } -@@ -250,9 +251,9 @@ int find_new_uid(bool sys_user, - /* Create an array to hold all of the discovered UIDs */ - used_uids = malloc (sizeof (bool) * (uid_max +1)); - if (NULL == used_uids) { -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: failed to allocate memory: %s\n"), -- Prog, strerror (errno)); -+ log_get_progname(), strerror (errno)); - return -1; - } - memset (used_uids, false, sizeof (bool) * (uid_max + 1)); -@@ -330,10 +331,10 @@ int find_new_uid(bool sys_user, - * - */ - if (!nospam) { -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: Can't get unique system UID (%s). " - "Suppressing additional messages.\n"), -- Prog, strerror (result)); -+ log_get_progname(), strerror (result)); - SYSLOG ((LOG_ERR, - "Error checking available UIDs: %s", - strerror (result))); -@@ -373,10 +374,10 @@ int find_new_uid(bool sys_user, - * - */ - if (!nospam) { -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: Can't get unique system UID (%s). " - "Suppressing additional messages.\n"), -- Prog, strerror (result)); -+ log_get_progname(), strerror (result)); - SYSLOG((LOG_ERR, - "Error checking available UIDs: %s", - strerror (result))); -@@ -433,10 +434,10 @@ int find_new_uid(bool sys_user, - * - */ - if (!nospam) { -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: Can't get unique UID (%s). " - "Suppressing additional messages.\n"), -- Prog, strerror (result)); -+ log_get_progname(), strerror (result)); - SYSLOG ((LOG_ERR, - "Error checking available UIDs: %s", - strerror (result))); -@@ -476,10 +477,10 @@ int find_new_uid(bool sys_user, - * - */ - if (!nospam) { -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: Can't get unique UID (%s). " - "Suppressing additional messages.\n"), -- Prog, strerror (result)); -+ log_get_progname(), strerror (result)); - SYSLOG ((LOG_ERR, - "Error checking available UIDs: %s", - strerror (result))); -@@ -495,9 +496,9 @@ int find_new_uid(bool sys_user, - } - - /* The code reached here and found no available IDs in the range */ -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: Can't get unique UID (no more available UIDs)\n"), -- Prog); -+ log_get_progname()); - SYSLOG ((LOG_WARN, "no more available UIDs on the system")); - free (used_uids); - return -1; -diff -up shadow-4.9/libmisc/gettime.c.debug1 shadow-4.9/libmisc/gettime.c ---- shadow-4.9/libmisc/gettime.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/libmisc/gettime.c 2022-01-10 10:45:52.204132951 +0100 -@@ -36,6 +36,7 @@ - #include - #include "defines.h" - #include "prototypes.h" -+#include "shadowlog.h" - - /* - * gettime() returns the time as the number of seconds since the Epoch -@@ -50,6 +51,7 @@ - char *source_date_epoch; - time_t fallback; - unsigned long long epoch; -+ FILE *shadow_logfd = log_get_logfd(); - - fallback = time (NULL); - source_date_epoch = shadow_getenv ("SOURCE_DATE_EPOCH"); -diff -up shadow-4.9/libmisc/idmapping.c.debug1 shadow-4.9/libmisc/idmapping.c ---- shadow-4.9/libmisc/idmapping.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/libmisc/idmapping.c 2022-01-10 10:45:52.204132951 +0100 -@@ -40,6 +40,7 @@ - #include - #include - #endif -+#include "shadowlog.h" - - struct map_range *get_map_ranges(int ranges, int argc, char **argv) - { -@@ -47,28 +48,28 @@ struct map_range *get_map_ranges(int ran - int idx, argidx; - - if (ranges < 0 || argc < 0) { -- fprintf(shadow_logfd, "%s: error calculating number of arguments\n", Prog); -+ fprintf(log_get_logfd(), "%s: error calculating number of arguments\n", log_get_progname()); - return NULL; - } - - if (ranges != ((argc + 2) / 3)) { -- fprintf(shadow_logfd, "%s: ranges: %u is wrong for argc: %d\n", Prog, ranges, argc); -+ fprintf(log_get_logfd(), "%s: ranges: %u is wrong for argc: %d\n", log_get_progname(), ranges, argc); - return NULL; - } - - if ((ranges * 3) > argc) { -- fprintf(shadow_logfd, "ranges: %u argc: %d\n", -+ fprintf(log_get_logfd(), "ranges: %u argc: %d\n", - ranges, argc); -- fprintf(shadow_logfd, -+ fprintf(log_get_logfd(), - _( "%s: Not enough arguments to form %u mappings\n"), -- Prog, ranges); -+ log_get_progname(), ranges); - return NULL; - } - - mappings = calloc(ranges, sizeof(*mappings)); - if (!mappings) { -- fprintf(shadow_logfd, _( "%s: Memory allocation failure\n"), -- Prog); -+ fprintf(log_get_logfd(), _( "%s: Memory allocation failure\n"), -+ log_get_progname()); - exit(EXIT_FAILURE); - } - -@@ -88,24 +89,24 @@ struct map_range *get_map_ranges(int ran - return NULL; - } - if (ULONG_MAX - mapping->upper <= mapping->count || ULONG_MAX - mapping->lower <= mapping->count) { -- fprintf(shadow_logfd, _( "%s: subuid overflow detected.\n"), Prog); -+ fprintf(log_get_logfd(), _( "%s: subuid overflow detected.\n"), log_get_progname()); - exit(EXIT_FAILURE); - } - if (mapping->upper > UINT_MAX || - mapping->lower > UINT_MAX || - mapping->count > UINT_MAX) { -- fprintf(shadow_logfd, _( "%s: subuid overflow detected.\n"), Prog); -+ fprintf(log_get_logfd(), _( "%s: subuid overflow detected.\n"), log_get_progname()); - exit(EXIT_FAILURE); - } - if (mapping->lower + mapping->count > UINT_MAX || - mapping->upper + mapping->count > UINT_MAX) { -- fprintf(shadow_logfd, _( "%s: subuid overflow detected.\n"), Prog); -+ fprintf(log_get_logfd(), _( "%s: subuid overflow detected.\n"), log_get_progname()); - exit(EXIT_FAILURE); - } - if (mapping->lower + mapping->count < mapping->lower || - mapping->upper + mapping->count < mapping->upper) { - /* this one really shouldn't be possible given previous checks */ -- fprintf(shadow_logfd, _( "%s: subuid overflow detected.\n"), Prog); -+ fprintf(log_get_logfd(), _( "%s: subuid overflow detected.\n"), log_get_progname()); - exit(EXIT_FAILURE); - } - } -@@ -176,19 +177,19 @@ void write_mapping(int proc_dir_fd, int - } else if (strcmp(map_file, "gid_map") == 0) { - cap = CAP_SETGID; - } else { -- fprintf(shadow_logfd, _("%s: Invalid map file %s specified\n"), Prog, map_file); -+ fprintf(log_get_logfd(), _("%s: Invalid map file %s specified\n"), log_get_progname(), map_file); - exit(EXIT_FAILURE); - } - - /* Align setuid- and fscaps-based new{g,u}idmap behavior. */ - if (geteuid() == 0 && geteuid() != ruid) { - if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0) < 0) { -- fprintf(shadow_logfd, _("%s: Could not prctl(PR_SET_KEEPCAPS)\n"), Prog); -+ fprintf(log_get_logfd(), _("%s: Could not prctl(PR_SET_KEEPCAPS)\n"), log_get_progname()); - exit(EXIT_FAILURE); - } - - if (seteuid(ruid) < 0) { -- fprintf(shadow_logfd, _("%s: Could not seteuid to %d\n"), Prog, ruid); -+ fprintf(log_get_logfd(), _("%s: Could not seteuid to %d\n"), log_get_progname(), ruid); - exit(EXIT_FAILURE); - } - } -@@ -204,7 +205,7 @@ void write_mapping(int proc_dir_fd, int - data[0].effective |= CAP_TO_MASK(CAP_SETFCAP); - data[0].permitted = data[0].effective; - if (capset(&hdr, data) < 0) { -- fprintf(shadow_logfd, _("%s: Could not set caps\n"), Prog); -+ fprintf(log_get_logfd(), _("%s: Could not set caps\n"), log_get_progname()); - exit(EXIT_FAILURE); - } - #endif -@@ -222,7 +223,7 @@ void write_mapping(int proc_dir_fd, int - mapping->lower, - mapping->count); - if ((written <= 0) || (written >= (bufsize - (pos - buf)))) { -- fprintf(shadow_logfd, _("%s: snprintf failed!\n"), Prog); -+ fprintf(log_get_logfd(), _("%s: snprintf failed!\n"), log_get_progname()); - exit(EXIT_FAILURE); - } - pos += written; -@@ -231,13 +232,13 @@ void write_mapping(int proc_dir_fd, int - /* Write the mapping to the mapping file */ - fd = openat(proc_dir_fd, map_file, O_WRONLY); - if (fd < 0) { -- fprintf(shadow_logfd, _("%s: open of %s failed: %s\n"), -- Prog, map_file, strerror(errno)); -+ fprintf(log_get_logfd(), _("%s: open of %s failed: %s\n"), -+ log_get_progname(), map_file, strerror(errno)); - exit(EXIT_FAILURE); - } - if (write(fd, buf, pos - buf) != (pos - buf)) { -- fprintf(shadow_logfd, _("%s: write to %s failed: %s\n"), -- Prog, map_file, strerror(errno)); -+ fprintf(log_get_logfd(), _("%s: write to %s failed: %s\n"), -+ log_get_progname(), map_file, strerror(errno)); - exit(EXIT_FAILURE); - } - close(fd); -diff -up shadow-4.9/libmisc/limits.c.debug1 shadow-4.9/libmisc/limits.c ---- shadow-4.9/libmisc/limits.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/libmisc/limits.c 2022-01-10 10:45:52.204132951 +0100 -@@ -50,6 +50,7 @@ - #include "defines.h" - #include - #include "getdef.h" -+#include "shadowlog.h" - #ifdef HAVE_SYS_RESOURCE_H - #include - #define LIMITS -@@ -548,7 +549,7 @@ void setup_limits (const struct passwd * - #ifdef LIMITS - if (info->pw_uid != 0) { - if ((setup_user_limits (info->pw_name) & LOGIN_ERROR_LOGIN) != 0) { -- (void) fputs (_("Too many logins.\n"), shadow_logfd); -+ (void) fputs (_("Too many logins.\n"), log_get_logfd()); - (void) sleep (2); /* XXX: Should be FAIL_DELAY */ - exit (EXIT_FAILURE); - } -diff -up shadow-4.9/libmisc/pam_pass.c.debug1 shadow-4.9/libmisc/pam_pass.c ---- shadow-4.9/libmisc/pam_pass.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/libmisc/pam_pass.c 2022-01-10 10:45:52.204132951 +0100 -@@ -46,11 +46,13 @@ - #include "defines.h" - #include "pam_defs.h" - #include "prototypes.h" -+#include "shadowlog.h" - - void do_pam_passwd (const char *user, bool silent, bool change_expired) - { - pam_handle_t *pamh = NULL; - int flags = 0, ret; -+ FILE *shadow_logfd = log_get_logfd(); - - if (silent) - flags |= PAM_SILENT; -diff -up shadow-4.9/libmisc/pam_pass_non_interactive.c.debug1 shadow-4.9/libmisc/pam_pass_non_interactive.c ---- shadow-4.9/libmisc/pam_pass_non_interactive.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/libmisc/pam_pass_non_interactive.c 2022-01-10 10:45:52.204132951 +0100 -@@ -38,6 +38,7 @@ - #include - #include - #include "prototypes.h" -+#include "shadowlog.h" - - /*@null@*/ /*@only@*/static const char *non_interactive_password = NULL; - static int ni_conv (int num_msg, -@@ -76,9 +77,9 @@ static int ni_conv (int num_msg, - - switch (msg[count]->msg_style) { - case PAM_PROMPT_ECHO_ON: -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: PAM modules requesting echoing are not supported.\n"), -- Prog); -+ log_get_progname()); - goto failed_conversation; - case PAM_PROMPT_ECHO_OFF: - responses[count].resp = strdup (non_interactive_password); -@@ -88,7 +89,7 @@ static int ni_conv (int num_msg, - break; - case PAM_ERROR_MSG: - if ( (NULL == msg[count]->msg) -- || (fprintf (shadow_logfd, "%s\n", msg[count]->msg) <0)) { -+ || (fprintf (log_get_logfd(), "%s\n", msg[count]->msg) <0)) { - goto failed_conversation; - } - responses[count].resp = NULL; -@@ -101,9 +102,9 @@ static int ni_conv (int num_msg, - responses[count].resp = NULL; - break; - default: -- (void) fprintf (shadow_logfd, -+ (void) fprintf (log_get_logfd(), - _("%s: conversation type %d not supported.\n"), -- Prog, msg[count]->msg_style); -+ log_get_progname(), msg[count]->msg_style); - goto failed_conversation; - } - } -@@ -143,19 +144,19 @@ int do_pam_passwd_non_interactive (const - - ret = pam_start (pam_service, username, &non_interactive_pam_conv, &pamh); - if (ret != PAM_SUCCESS) { -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: (user %s) pam_start failure %d\n"), -- Prog, username, ret); -+ log_get_progname(), username, ret); - return 1; - } - - non_interactive_password = password; - ret = pam_chauthtok (pamh, 0); - if (ret != PAM_SUCCESS) { -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: (user %s) pam_chauthtok() failed, error:\n" - "%s\n"), -- Prog, username, pam_strerror (pamh, ret)); -+ log_get_progname(), username, pam_strerror (pamh, ret)); - } - - (void) pam_end (pamh, PAM_SUCCESS); -diff -up shadow-4.9/libmisc/prefix_flag.c.debug1 shadow-4.9/libmisc/prefix_flag.c ---- shadow-4.9/libmisc/prefix_flag.c.debug1 2022-01-10 10:45:52.201132929 +0100 -+++ shadow-4.9/libmisc/prefix_flag.c 2022-01-10 10:45:52.204132951 +0100 -@@ -48,6 +48,7 @@ - #include "subordinateio.h" - #endif /* ENABLE_SUBIDS */ - #include "getdef.h" -+#include "shadowlog.h" - - static char *passwd_db_file = NULL; - static char *spw_db_file = NULL; -@@ -83,18 +84,18 @@ extern const char* process_prefix_flag ( - && (val = argv[i] + 9)) - || (strcmp (argv[i], short_opt) == 0)) { - if (NULL != prefix) { -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: multiple --prefix options\n"), -- Prog); -+ log_get_progname()); - exit (E_BAD_ARG); - } - - if (val) { - prefix = val; - } else if (i + 1 == argc) { -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: option '%s' requires an argument\n"), -- Prog, argv[i]); -+ log_get_progname(), argv[i]); - exit (E_BAD_ARG); - } else { - prefix = argv[++ i]; -@@ -110,9 +111,9 @@ extern const char* process_prefix_flag ( - /* should we prevent symbolic link from being used as a prefix? */ - - if ( prefix[0] != '/') { -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: prefix must be an absolute path\n"), -- Prog); -+ log_get_progname()); - exit (E_BAD_ARG); - } - size_t len; -diff -up shadow-4.9/libmisc/pwdcheck.c.debug1 shadow-4.9/libmisc/pwdcheck.c ---- shadow-4.9/libmisc/pwdcheck.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/libmisc/pwdcheck.c 2022-01-10 10:45:52.204132951 +0100 -@@ -39,6 +39,7 @@ - #include "prototypes.h" - #include "defines.h" - #include "pwauth.h" -+#include "shadowlog.h" - - void passwd_check (const char *user, const char *passwd, unused const char *progname) - { -@@ -51,7 +52,7 @@ void passwd_check (const char *user, con - if (pw_auth (passwd, user, PW_LOGIN, (char *) 0) != 0) { - SYSLOG ((LOG_WARN, "incorrect password for `%s'", user)); - (void) sleep (1); -- fprintf (shadow_logfd, _("Incorrect password for %s.\n"), user); -+ fprintf (log_get_logfd(), _("Incorrect password for %s.\n"), user); - exit (EXIT_FAILURE); - } - } -diff -up shadow-4.9/libmisc/root_flag.c.debug1 shadow-4.9/libmisc/root_flag.c ---- shadow-4.9/libmisc/root_flag.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/libmisc/root_flag.c 2022-01-10 10:45:52.204132951 +0100 -@@ -38,6 +38,7 @@ - #include "prototypes.h" - /*@-exitarg@*/ - #include "exitcodes.h" -+#include "shadowlog.h" - - static void change_root (const char* newroot); - -@@ -65,18 +66,18 @@ extern void process_root_flag (const cha - && (val = argv[i] + 7)) - || (strcmp (argv[i], short_opt) == 0)) { - if (NULL != newroot) { -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: multiple --root options\n"), -- Prog); -+ log_get_progname()); - exit (E_BAD_ARG); - } - - if (val) { - newroot = val; - } else if (i + 1 == argc) { -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: option '%s' requires an argument\n"), -- Prog, argv[i]); -+ log_get_progname(), argv[i]); - exit (E_BAD_ARG); - } else { - newroot = argv[++ i]; -@@ -94,36 +95,36 @@ static void change_root (const char* new - /* Drop privileges */ - if ( (setregid (getgid (), getgid ()) != 0) - || (setreuid (getuid (), getuid ()) != 0)) { -- fprintf (shadow_logfd, _("%s: failed to drop privileges (%s)\n"), -- Prog, strerror (errno)); -+ fprintf (log_get_logfd(), _("%s: failed to drop privileges (%s)\n"), -+ log_get_progname(), strerror (errno)); - exit (EXIT_FAILURE); - } - - if ('/' != newroot[0]) { -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: invalid chroot path '%s'\n"), -- Prog, newroot); -+ log_get_progname(), newroot); - exit (E_BAD_ARG); - } - - if (access (newroot, F_OK) != 0) { -- fprintf(shadow_logfd, -+ fprintf(log_get_logfd(), - _("%s: cannot access chroot directory %s: %s\n"), -- Prog, newroot, strerror (errno)); -+ log_get_progname(), newroot, strerror (errno)); - exit (E_BAD_ARG); - } - - if (chdir (newroot) != 0) { -- fprintf(shadow_logfd, -+ fprintf(log_get_logfd(), - _("%s: cannot chdir to chroot directory %s: %s\n"), -- Prog, newroot, strerror (errno)); -+ log_get_progname(), newroot, strerror (errno)); - exit (E_BAD_ARG); - } - - if (chroot (newroot) != 0) { -- fprintf(shadow_logfd, -+ fprintf(log_get_logfd(), - _("%s: unable to chroot to directory %s: %s\n"), -- Prog, newroot, strerror (errno)); -+ log_get_progname(), newroot, strerror (errno)); - exit (E_BAD_ARG); - } - } -diff -up shadow-4.9/libmisc/salt.c.debug1 shadow-4.9/libmisc/salt.c ---- shadow-4.9/libmisc/salt.c.debug1 2022-01-10 10:45:52.195132887 +0100 -+++ shadow-4.9/libmisc/salt.c 2022-01-10 10:45:52.204132951 +0100 -@@ -21,6 +21,7 @@ - #include "prototypes.h" - #include "defines.h" - #include "getdef.h" -+#include "shadowlog.h" - - #if (defined CRYPT_GENSALT_IMPLEMENTS_AUTO_ENTROPY && \ - CRYPT_GENSALT_IMPLEMENTS_AUTO_ENTROPY) -@@ -178,7 +179,7 @@ static long read_random_bytes (void) - #endif - - fail: -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("Unable to obtain random bytes.\n")); - exit (1); - -@@ -506,7 +507,7 @@ static /*@observer@*/const char *gensalt - SHA_salt_rounds_to_buf (result, rounds); - #endif /* USE_SHA_CRYPT */ - } else if (0 != strcmp (method, "DES")) { -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("Invalid ENCRYPT_METHOD value: '%s'.\n" - "Defaulting to DES.\n"), - method); -@@ -532,7 +533,7 @@ static /*@observer@*/const char *gensalt - - /* Should not happen, but... */ - if (NULL == retval) { -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("Unable to generate a salt from setting " - "\"%s\", check your settings in " - "ENCRYPT_METHOD and the corresponding " -diff -up shadow-4.9/libmisc/setupenv.c.debug1 shadow-4.9/libmisc/setupenv.c ---- shadow-4.9/libmisc/setupenv.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/libmisc/setupenv.c 2022-01-10 10:45:52.204132951 +0100 -@@ -47,6 +47,7 @@ - #include "defines.h" - #include - #include "getdef.h" -+#include "shadowlog.h" - - #ifndef USE_PAM - static void -@@ -219,7 +220,7 @@ void setup_env (struct passwd *info) - static char temp_pw_dir[] = "/"; - - if (!getdef_bool ("DEFAULT_HOME") || chdir ("/") == -1) { -- fprintf (shadow_logfd, _("Unable to cd to '%s'\n"), -+ fprintf (log_get_logfd(), _("Unable to cd to '%s'\n"), - info->pw_dir); - SYSLOG ((LOG_WARN, - "unable to cd to `%s' for user `%s'\n", -diff -up shadow-4.9/libmisc/user_busy.c.debug1 shadow-4.9/libmisc/user_busy.c ---- shadow-4.9/libmisc/user_busy.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/libmisc/user_busy.c 2022-01-10 10:45:52.204132951 +0100 -@@ -45,6 +45,7 @@ - #ifdef ENABLE_SUBIDS - #include "subordinateio.h" - #endif /* ENABLE_SUBIDS */ -+#include "shadowlog.h" - - #ifdef __linux__ - static int check_status (const char *name, const char *sname, uid_t uid); -@@ -96,9 +97,9 @@ static int user_busy_utmp (const char *n - continue; - } - -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: user %s is currently logged in\n"), -- Prog, name); -+ log_get_progname(), name); - return 1; - } - -@@ -249,9 +250,9 @@ static int user_busy_processes (const ch - #ifdef ENABLE_SUBIDS - sub_uid_close(); - #endif -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: user %s is currently used by process %d\n"), -- Prog, name, pid); -+ log_get_progname(), name, pid); - return 1; - } - -@@ -273,9 +274,9 @@ static int user_busy_processes (const ch - #ifdef ENABLE_SUBIDS - sub_uid_close(); - #endif -- fprintf (shadow_logfd, -+ fprintf (log_get_logfd(), - _("%s: user %s is currently used by process %d\n"), -- Prog, name, pid); -+ log_get_progname(), name, pid); - return 1; - } - } -diff -up shadow-4.9/libmisc/xgetXXbyYY.c.debug1 shadow-4.9/libmisc/xgetXXbyYY.c ---- shadow-4.9/libmisc/xgetXXbyYY.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/libmisc/xgetXXbyYY.c 2022-01-10 10:45:52.204132951 +0100 -@@ -54,6 +54,7 @@ - #include - #include - #include "prototypes.h" -+#include "shadowlog.h" - - #define XFUNCTION_NAME XPREFIX (FUNCTION_NAME) - #define XPREFIX(name) XPREFIX1 (name) -@@ -74,7 +75,7 @@ - - result = malloc(sizeof(LOOKUP_TYPE)); - if (NULL == result) { -- fprintf (shadow_logfd, _("%s: out of memory\n"), -+ fprintf (log_get_logfd(), _("%s: out of memory\n"), - "x" STRINGIZE(FUNCTION_NAME)); - exit (13); - } -@@ -84,7 +85,7 @@ - LOOKUP_TYPE *resbuf = NULL; - buffer = (char *)realloc (buffer, length); - if (NULL == buffer) { -- fprintf (shadow_logfd, _("%s: out of memory\n"), -+ fprintf (log_get_logfd(), _("%s: out of memory\n"), - "x" STRINGIZE(FUNCTION_NAME)); - exit (13); - } -@@ -132,7 +133,7 @@ - if (result) { - result = DUP_FUNCTION(result); - if (NULL == result) { -- fprintf (shadow_logfd, _("%s: out of memory\n"), -+ fprintf (log_get_logfd(), _("%s: out of memory\n"), - "x" STRINGIZE(FUNCTION_NAME)); - exit (13); - } -diff -up shadow-4.9/libmisc/xmalloc.c.debug1 shadow-4.9/libmisc/xmalloc.c ---- shadow-4.9/libmisc/xmalloc.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/libmisc/xmalloc.c 2022-01-10 10:45:52.204132951 +0100 -@@ -47,6 +47,7 @@ - #include - #include "defines.h" - #include "prototypes.h" -+#include "shadowlog.h" - - /*@maynotreturn@*/ /*@only@*//*@out@*//*@notnull@*/char *xmalloc (size_t size) - { -@@ -54,9 +55,9 @@ - - ptr = (char *) malloc (size); - if (NULL == ptr) { -- (void) fprintf (shadow_logfd, -+ (void) fprintf (log_get_logfd(), - _("%s: failed to allocate memory: %s\n"), -- Prog, strerror (errno)); -+ log_get_progname(), strerror (errno)); - exit (13); - } - return ptr; -diff -up shadow-4.9/lib/nscd.c.debug1 shadow-4.9/lib/nscd.c ---- shadow-4.9/lib/nscd.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/lib/nscd.c 2022-01-10 10:45:52.202132937 +0100 -@@ -10,6 +10,7 @@ - #include "defines.h" - #include "prototypes.h" - #include "nscd.h" -+#include "shadowlog_internal.h" - - #define MSG_NSCD_FLUSH_CACHE_FAILED "%s: Failed to flush the nscd cache.\n" - -diff -up shadow-4.9/lib/nss.c.debug1 shadow-4.9/lib/nss.c ---- shadow-4.9/lib/nss.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/lib/nss.c 2022-01-10 10:45:52.202132937 +0100 -@@ -8,6 +8,7 @@ - #include - #include "prototypes.h" - #include "../libsubid/subid.h" -+#include "shadowlog_internal.h" - - #define NSSWITCH "/etc/nsswitch.conf" - -diff -up shadow-4.9/lib/prototypes.h.debug1 shadow-4.9/lib/prototypes.h ---- shadow-4.9/lib/prototypes.h.debug1 2022-01-10 10:45:52.195132887 +0100 -+++ shadow-4.9/lib/prototypes.h 2022-01-10 10:45:52.202132937 +0100 -@@ -59,9 +59,6 @@ - #include "defines.h" - #include "commonio.h" - --extern /*@observer@*/ const char *Prog; /* Program name showed in error messages */ --extern FILE *shadow_logfd; /* file descripter to which error messages are printed */ -- - /* addgrps.c */ - #if defined (HAVE_SETGROUPS) && ! defined (USE_PAM) - extern int add_groups (const char *); -diff -up shadow-4.9/lib/run_part.c.debug1 shadow-4.9/lib/run_part.c ---- shadow-4.9/lib/run_part.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/lib/run_part.c 2022-01-10 10:45:52.202132937 +0100 -@@ -8,6 +8,7 @@ - #include - #include - #include -+#include "shadowlog_internal.h" - - int run_part (char *script_path, char *name, char *action) - { -diff -up shadow-4.9/lib/selinux.c.debug1 shadow-4.9/lib/selinux.c ---- shadow-4.9/lib/selinux.c.debug1 2022-01-10 10:45:52.196132894 +0100 -+++ shadow-4.9/lib/selinux.c 2022-01-10 10:45:52.202132937 +0100 -@@ -38,6 +38,8 @@ - #include - #include "prototypes.h" - -+#include "shadowlog_internal.h" -+ - static bool selinux_checked = false; - static bool selinux_enabled; - static /*@null@*/struct selabel_handle *selabel_hnd = NULL; -diff -up shadow-4.9/lib/semanage.c.debug1 shadow-4.9/lib/semanage.c ---- shadow-4.9/lib/semanage.c.debug1 2022-01-10 10:45:52.196132894 +0100 -+++ shadow-4.9/lib/semanage.c 2022-01-10 10:45:52.202132937 +0100 -@@ -43,6 +43,7 @@ - #include - #include "prototypes.h" - -+#include "shadowlog_internal.h" - - #ifndef DEFAULT_SERANGE - #define DEFAULT_SERANGE "s0" -diff -up shadow-4.9/lib/shadowlog.c.debug1 shadow-4.9/lib/shadowlog.c ---- shadow-4.9/lib/shadowlog.c.debug1 2022-01-10 10:45:52.202132937 +0100 -+++ shadow-4.9/lib/shadowlog.c 2022-01-10 10:45:52.202132937 +0100 -@@ -0,0 +1,28 @@ -+#include "shadowlog.h" -+ -+#include "lib/shadowlog_internal.h" -+ -+void log_set_progname(const char *progname) -+{ -+ Prog = progname; -+} -+ -+const char *log_get_progname(void) -+{ -+ return Prog; -+} -+ -+void log_set_logfd(FILE *fd) -+{ -+ if (NULL != fd) -+ shadow_logfd = fd; -+ else -+ shadow_logfd = stderr; -+} -+ -+FILE *log_get_logfd(void) -+{ -+ if (shadow_logfd != NULL) -+ return shadow_logfd; -+ return stderr; -+} -diff -up shadow-4.9/lib/shadowlog.h.debug1 shadow-4.9/lib/shadowlog.h ---- shadow-4.9/lib/shadowlog.h.debug1 2022-01-10 10:45:52.202132937 +0100 -+++ shadow-4.9/lib/shadowlog.h 2022-01-10 10:45:52.202132937 +0100 -@@ -0,0 +1,41 @@ -+/* -+ * Copyright (c) 2021 , Serge Hallyn -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 3. The name of the copyright holders or contributors may not be used to -+ * endorse or promote products derived from this software without -+ * specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+/* $Id$ */ -+#ifndef _LOG_H -+#define _LOG_H -+#include -+ -+extern void log_set_progname(const char *); -+extern const char *log_get_progname(void); -+extern void log_set_logfd(FILE *fd); -+extern FILE *log_get_logfd(void); -+extern void log_dolog(char *, ...); -+ -+#endif -diff -up shadow-4.9/lib/shadowlog_internal.h.debug1 shadow-4.9/lib/shadowlog_internal.h ---- shadow-4.9/lib/shadowlog_internal.h.debug1 2022-01-10 10:45:52.202132937 +0100 -+++ shadow-4.9/lib/shadowlog_internal.h 2022-01-10 10:45:52.202132937 +0100 -@@ -0,0 +1,2 @@ -+const char *Prog; /* Program name showed in error messages */ -+FILE *shadow_logfd; /* file descripter to which error messages are printed */ -diff -up shadow-4.9/lib/spawn.c.debug1 shadow-4.9/lib/spawn.c ---- shadow-4.9/lib/spawn.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/lib/spawn.c 2022-01-10 10:45:52.202132937 +0100 -@@ -38,6 +38,8 @@ - #include "exitcodes.h" - #include "prototypes.h" - -+#include "shadowlog_internal.h" -+ - int run_command (const char *cmd, const char *argv[], - /*@null@*/const char *envp[], /*@out@*/int *status) - { -diff -up shadow-4.9/lib/sssd.c.debug1 shadow-4.9/lib/sssd.c ---- shadow-4.9/lib/sssd.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/lib/sssd.c 2022-01-10 10:45:52.203132944 +0100 -@@ -11,6 +11,8 @@ - #include "prototypes.h" - #include "sssd.h" - -+#include "shadowlog_internal.h" -+ - #define MSG_SSSD_FLUSH_CACHE_FAILED "%s: Failed to flush the sssd cache." - - int sssd_flush_cache (int dbflags) -diff -up shadow-4.9/libsubid/api.c.debug1 shadow-4.9/libsubid/api.c ---- shadow-4.9/libsubid/api.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/libsubid/api.c 2022-01-10 10:48:14.913151522 +0100 -@@ -38,12 +38,13 @@ - #include "subordinateio.h" - #include "idmapping.h" - #include "subid.h" -+#include "shadowlog.h" - - const char *Prog = "(libsubid)"; --FILE *shadow_logfd; - - bool libsubid_init(const char *progname, FILE * logfd) - { -+ FILE *shadow_logfd; - if (progname) { - progname = strdup(progname); - if (progname) -@@ -53,14 +54,15 @@ bool libsubid_init(const char *progname, - } - - if (logfd) { -- shadow_logfd = logfd; -+ log_set_logfd(logfd); - return true; - } - shadow_logfd = fopen("/dev/null", "w"); - if (!shadow_logfd) { -- shadow_logfd = stderr; -+ log_set_logfd(stderr); - return false; - } -+ log_set_logfd(shadow_logfd); - return true; - } - -diff -up shadow-4.9/lib/tcbfuncs.c.debug1 shadow-4.9/lib/tcbfuncs.c ---- shadow-4.9/lib/tcbfuncs.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/lib/tcbfuncs.c 2022-01-10 10:45:52.203132944 +0100 -@@ -38,6 +38,8 @@ - #include "shadowio.h" - #include "tcbfuncs.h" - -+#include "shadowlog_internal.h" -+ - #define SHADOWTCB_HASH_BY 1000 - #define SHADOWTCB_LOCK_SUFFIX ".lock" - -diff -up shadow-4.9/src/chage.c.debug1 shadow-4.9/src/chage.c ---- shadow-4.9/src/chage.c.debug1 2022-01-10 10:45:52.188132837 +0100 -+++ shadow-4.9/src/chage.c 2022-01-10 10:45:52.205132958 +0100 -@@ -52,6 +52,7 @@ - #include "defines.h" - #include "pwio.h" - #include "shadowio.h" -+#include "shadowlog.h" - #ifdef WITH_TCB - #include "tcbfuncs.h" - #endif -@@ -62,7 +63,6 @@ - * Global variables - */ - const char *Prog; --FILE *shadow_logfd = NULL; - - static bool - dflg = false, /* set last password change date */ -@@ -820,7 +820,8 @@ int main (int argc, char **argv) - * Get the program name so that error messages can use it. - */ - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - sanitize_env (); - (void) setlocale (LC_ALL, ""); -diff -up shadow-4.9/src/check_subid_range.c.debug1 shadow-4.9/src/check_subid_range.c ---- shadow-4.9/src/check_subid_range.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/src/check_subid_range.c 2022-01-10 10:45:52.205132958 +0100 -@@ -16,9 +16,9 @@ - #include "prototypes.h" - #include "subordinateio.h" - #include "idmapping.h" -+#include "shadowlog.h" - - const char *Prog; --FILE *shadow_logfd = NULL; - - int main(int argc, char **argv) - { -@@ -26,7 +26,8 @@ int main(int argc, char **argv) - unsigned long start, count; - bool check_uids; - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - if (argc != 5) - exit(1); -diff -up shadow-4.9/src/chfn.c.debug1 shadow-4.9/src/chfn.c ---- shadow-4.9/src/chfn.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/src/chfn.c 2022-01-10 10:45:52.205132958 +0100 -@@ -52,12 +52,12 @@ - #include "pwio.h" - /*@-exitarg@*/ - #include "exitcodes.h" -+#include "shadowlog.h" - - /* - * Global variables. - */ - const char *Prog; --FILE *shadow_logfd = NULL; - static char fullnm[BUFSIZ]; - static char roomno[BUFSIZ]; - static char workph[BUFSIZ]; -@@ -640,7 +640,8 @@ int main (int argc, char **argv) - * prefix to most error messages. - */ - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - sanitize_env (); - (void) setlocale (LC_ALL, ""); -diff -up shadow-4.9/src/chgpasswd.c.debug1 shadow-4.9/src/chgpasswd.c ---- shadow-4.9/src/chgpasswd.c.debug1 2022-01-10 10:45:52.188132837 +0100 -+++ shadow-4.9/src/chgpasswd.c 2022-01-10 10:45:52.205132958 +0100 -@@ -61,12 +61,12 @@ - #endif - /*@-exitarg@*/ - #include "exitcodes.h" -+#include "shadowlog.h" - - /* - * Global variables - */ - const char *Prog; --FILE *shadow_logfd = NULL; - static bool eflg = false; - static bool md5flg = false; - #if defined(USE_SHA_CRYPT) || defined(USE_BCRYPT) || defined(USE_YESCRYPT) -@@ -506,7 +506,8 @@ int main (int argc, char **argv) - int line = 0; - - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - (void) setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); -diff -up shadow-4.9/src/chpasswd.c.debug1 shadow-4.9/src/chpasswd.c ---- shadow-4.9/src/chpasswd.c.debug1 2022-01-10 10:45:52.188132837 +0100 -+++ shadow-4.9/src/chpasswd.c 2022-01-10 10:45:52.205132958 +0100 -@@ -58,12 +58,12 @@ - #include "shadowio.h" - /*@-exitarg@*/ - #include "exitcodes.h" -+#include "shadowlog.h" - - /* - * Global variables - */ - const char *Prog; --FILE *shadow_logfd = NULL; - static bool eflg = false; - static bool md5flg = false; - #if defined(USE_SHA_CRYPT) || defined(USE_BCRYPT) || defined(USE_YESCRYPT) -@@ -494,7 +494,8 @@ int main (int argc, char **argv) - int line = 0; - - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - (void) setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); -diff -up shadow-4.9/src/chsh.c.debug1 shadow-4.9/src/chsh.c ---- shadow-4.9/src/chsh.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/src/chsh.c 2022-01-10 10:45:52.205132958 +0100 -@@ -51,6 +51,7 @@ - #endif - /*@-exitarg@*/ - #include "exitcodes.h" -+#include "shadowlog.h" - - #ifndef SHELLS_FILE - #define SHELLS_FILE "/etc/shells" -@@ -59,7 +60,6 @@ - * Global variables - */ - const char *Prog; /* Program name */ --FILE *shadow_logfd = NULL; - static bool amroot; /* Real UID is root */ - static char loginsh[BUFSIZ]; /* Name of new login shell */ - /* command line options */ -@@ -442,7 +442,8 @@ int main (int argc, char **argv) - * most error messages. - */ - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - (void) setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); -diff -up shadow-4.9/src/expiry.c.debug1 shadow-4.9/src/expiry.c ---- shadow-4.9/src/expiry.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/src/expiry.c 2022-01-10 10:45:52.205132958 +0100 -@@ -43,10 +43,10 @@ - #include "prototypes.h" - /*@-exitarg@*/ - #include "exitcodes.h" -+#include "shadowlog.h" - - /* Global variables */ - const char *Prog; --FILE *shadow_logfd = NULL; - static bool cflg = false; - - /* local function prototypes */ -@@ -145,7 +145,8 @@ int main (int argc, char **argv) - struct spwd *spwd; - - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - sanitize_env (); - -diff -up shadow-4.9/src/faillog.c.debug1 shadow-4.9/src/faillog.c ---- shadow-4.9/src/faillog.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/src/faillog.c 2022-01-10 10:45:52.205132958 +0100 -@@ -46,6 +46,7 @@ - #include "prototypes.h" - /*@-exitarg@*/ - #include "exitcodes.h" -+#include "shadowlog.h" - - /* local function prototypes */ - static /*@noreturn@*/void usage (int status); -@@ -62,7 +63,6 @@ static void reset (void); - * Global variables - */ - const char *Prog; /* Program name */ --FILE *shadow_logfd = NULL; - static FILE *fail; /* failure file stream */ - static time_t seconds; /* that number of days in seconds */ - static unsigned long umin; /* if uflg and has_umin, only display users with uid >= umin */ -@@ -574,7 +574,8 @@ int main (int argc, char **argv) - * most error messages. - */ - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - (void) setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); -diff -up shadow-4.9/src/free_subid_range.c.debug1 shadow-4.9/src/free_subid_range.c ---- shadow-4.9/src/free_subid_range.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/src/free_subid_range.c 2022-01-10 10:45:52.205132958 +0100 -@@ -3,11 +3,11 @@ - #include "subid.h" - #include "stdlib.h" - #include "prototypes.h" -+#include "shadowlog.h" - - /* Test program for the subid freeing routine */ - - const char *Prog; --FILE *shadow_logfd = NULL; - - void usage(void) - { -@@ -24,7 +24,8 @@ int main(int argc, char *argv[]) - bool group = false; // get subuids by default - - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - while ((c = getopt(argc, argv, "g")) != EOF) { - switch(c) { - case 'g': group = true; break; -diff -up shadow-4.9/src/get_subid_owners.c.debug1 shadow-4.9/src/get_subid_owners.c ---- shadow-4.9/src/get_subid_owners.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/src/get_subid_owners.c 2022-01-10 10:45:52.205132958 +0100 -@@ -2,9 +2,9 @@ - #include "subid.h" - #include "stdlib.h" - #include "prototypes.h" -+#include "shadowlog.h" - - const char *Prog; --FILE *shadow_logfd = NULL; - - void usage(void) - { -@@ -20,7 +20,8 @@ int main(int argc, char *argv[]) - uid_t *uids; - - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - if (argc < 2) { - usage(); - } -diff -up shadow-4.9/src/getsubids.c.debug1 shadow-4.9/src/getsubids.c ---- shadow-4.9/src/getsubids.c.debug1 2022-01-10 10:45:52.200132922 +0100 -+++ shadow-4.9/src/getsubids.c 2022-01-10 10:45:52.205132958 +0100 -@@ -3,9 +3,9 @@ - #include - #include "subid.h" - #include "prototypes.h" -+#include "shadowlog.h" - - const char *Prog; --FILE *shadow_logfd = NULL; - - void usage(void) - { -@@ -22,7 +22,8 @@ int main(int argc, char *argv[]) - const char *owner; - - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - if (argc < 2) - usage(); - owner = argv[1]; -diff -up shadow-4.9/src/gpasswd.c.debug1 shadow-4.9/src/gpasswd.c ---- shadow-4.9/src/gpasswd.c.debug1 2022-01-10 10:45:52.184132808 +0100 -+++ shadow-4.9/src/gpasswd.c 2022-01-10 10:45:52.205132958 +0100 -@@ -53,12 +53,12 @@ - /*@-exitarg@*/ - #include "exitcodes.h" - -+#include "shadowlog.h" - /* - * Global variables - */ - /* The name of this command, as it is invoked */ - const char *Prog; --FILE *shadow_logfd = NULL; - - #ifdef SHADOWGRP - /* Indicate if shadow groups are enabled on the system -@@ -927,7 +927,8 @@ int main (int argc, char **argv) - */ - bywho = getuid (); - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - OPENLOG ("gpasswd"); - setbuf (stdout, NULL); -diff -up shadow-4.9/src/groupadd.c.debug1 shadow-4.9/src/groupadd.c ---- shadow-4.9/src/groupadd.c.debug1 2022-01-10 10:45:52.184132808 +0100 -+++ shadow-4.9/src/groupadd.c 2022-01-10 10:45:52.205132958 +0100 -@@ -56,6 +56,7 @@ - #ifdef SHADOWGRP - #include "sgroupio.h" - #endif -+#include "shadowlog.h" - - /* - * exit status values -@@ -72,7 +73,6 @@ - * Global variables - */ - const char *Prog; --FILE *shadow_logfd = NULL; - - static /*@null@*/char *group_name; - static gid_t group_id; -@@ -602,7 +602,8 @@ int main (int argc, char **argv) - * Get my name so that I can use it to report errors. - */ - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - (void) setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); -diff -up shadow-4.9/src/groupdel.c.debug1 shadow-4.9/src/groupdel.c ---- shadow-4.9/src/groupdel.c.debug1 2022-01-10 10:45:52.185132815 +0100 -+++ shadow-4.9/src/groupdel.c 2022-01-10 10:45:52.205132958 +0100 -@@ -54,11 +54,11 @@ - #ifdef SHADOWGRP - #include "sgroupio.h" - #endif -+#include "shadowlog.h" - /* - * Global variables - */ - const char *Prog; --FILE *shadow_logfd = NULL; - - static char *group_name; - static gid_t group_id = -1; -@@ -379,7 +379,8 @@ int main (int argc, char **argv) - * Get my name so that I can use it to report errors. - */ - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - (void) setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); -diff -up shadow-4.9/src/groupmems.c.debug1 shadow-4.9/src/groupmems.c ---- shadow-4.9/src/groupmems.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/src/groupmems.c 2022-01-10 10:45:52.206132965 +0100 -@@ -47,6 +47,7 @@ - #ifdef SHADOWGRP - #include "sgroupio.h" - #endif -+#include "shadowlog.h" - - /* Exit Status Values */ - /*@-exitarg@*/ -@@ -65,7 +66,6 @@ - * Global variables - */ - const char *Prog; --FILE *shadow_logfd = NULL; - - static char *adduser = NULL; - static char *deluser = NULL; -@@ -596,7 +596,8 @@ int main (int argc, char **argv) - * Get my name so that I can use it to report errors. - */ - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - (void) setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); -diff -up shadow-4.9/src/groupmod.c.debug1 shadow-4.9/src/groupmod.c ---- shadow-4.9/src/groupmod.c.debug1 2022-01-10 10:45:52.185132815 +0100 -+++ shadow-4.9/src/groupmod.c 2022-01-10 10:45:52.206132965 +0100 -@@ -56,6 +56,7 @@ - #ifdef SHADOWGRP - #include "sgroupio.h" - #endif -+#include "shadowlog.h" - /* - * exit status values - */ -@@ -76,7 +77,6 @@ - * Global variables - */ - const char *Prog; --FILE *shadow_logfd = NULL; - - #ifdef SHADOWGRP - static bool is_shadow_grp; -@@ -840,7 +840,8 @@ int main (int argc, char **argv) - * Get my name so that I can use it to report errors. - */ - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - (void) setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); -diff -up shadow-4.9/src/groups.c.debug1 shadow-4.9/src/groups.c ---- shadow-4.9/src/groups.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/src/groups.c 2022-01-10 10:45:52.206132965 +0100 -@@ -39,11 +39,11 @@ - #include - #include "defines.h" - #include "prototypes.h" -+#include "shadowlog.h" - /* - * Global variables - */ - const char *Prog; --FILE *shadow_logfd = NULL; - - /* local function prototypes */ - static void print_groups (const char *member); -@@ -127,7 +127,8 @@ int main (int argc, char **argv) - * Get the program name so that error messages can use it. - */ - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - if (argc == 1) { - -diff -up shadow-4.9/src/grpck.c.debug1 shadow-4.9/src/grpck.c ---- shadow-4.9/src/grpck.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/src/grpck.c 2022-01-10 10:45:52.206132965 +0100 -@@ -45,6 +45,7 @@ - #include "nscd.h" - #include "sssd.h" - #include "prototypes.h" -+#include "shadowlog.h" - - #ifdef SHADOWGRP - #include "sgroupio.h" -@@ -66,7 +67,6 @@ - * Global variables - */ - const char *Prog; --FILE *shadow_logfd = NULL; - - static const char *grp_file = GROUP_FILE; - static bool use_system_grp_file = true; -@@ -841,7 +841,8 @@ int main (int argc, char **argv) - * Get my name so that I can use it to report errors. - */ - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - (void) setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); -diff -up shadow-4.9/src/grpconv.c.debug1 shadow-4.9/src/grpconv.c ---- shadow-4.9/src/grpconv.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/src/grpconv.c 2022-01-10 10:45:52.206132965 +0100 -@@ -55,11 +55,11 @@ - #ifdef SHADOWGRP - #include "groupio.h" - #include "sgroupio.h" -+#include "shadowlog.h" - /* - * Global variables - */ - const char *Prog; --FILE *shadow_logfd = NULL; - - static bool gr_locked = false; - static bool sgr_locked = false; -@@ -147,7 +147,8 @@ int main (int argc, char **argv) - struct sgrp sgent; - - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - (void) setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); -diff -up shadow-4.9/src/grpunconv.c.debug1 shadow-4.9/src/grpunconv.c ---- shadow-4.9/src/grpunconv.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/src/grpunconv.c 2022-01-10 10:45:52.206132965 +0100 -@@ -55,11 +55,11 @@ - #ifdef SHADOWGRP - #include "groupio.h" - #include "sgroupio.h" -+#include "shadowlog.h" - /* - * Global variables - */ - const char *Prog; --FILE *shadow_logfd = NULL; - - static bool gr_locked = false; - static bool sgr_locked = false; -@@ -146,7 +146,8 @@ int main (int argc, char **argv) - const struct sgrp *sg; - - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - (void) setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); -diff -up shadow-4.9/src/lastlog.c.debug1 shadow-4.9/src/lastlog.c ---- shadow-4.9/src/lastlog.c.debug1 2022-01-10 10:45:52.189132844 +0100 -+++ shadow-4.9/src/lastlog.c 2022-01-10 10:45:52.206132965 +0100 -@@ -50,6 +50,7 @@ - #include "getdef.h" - /*@-exitarg@*/ - #include "exitcodes.h" -+#include "shadowlog.h" - - /* - * Needed for MkLinux DR1/2/2.1 - J. -@@ -62,7 +63,6 @@ - * Global variables - */ - const char *Prog; /* Program name */ --FILE *shadow_logfd = NULL; - static FILE *lastlogfile; /* lastlog file stream */ - static unsigned long umin; /* if uflg and has_umin, only display users with uid >= umin */ - static bool has_umin = false; -@@ -322,7 +322,8 @@ int main (int argc, char **argv) - * most error messages. - */ - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - (void) setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); -diff -up shadow-4.9/src/login.c.debug1 shadow-4.9/src/login.c ---- shadow-4.9/src/login.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/src/login.c 2022-01-10 10:45:52.206132965 +0100 -@@ -53,6 +53,7 @@ - #include "pwauth.h" - /*@-exitarg@*/ - #include "exitcodes.h" -+#include "shadowlog.h" - - #ifdef USE_PAM - #include "pam_defs.h" -@@ -83,7 +84,6 @@ static pam_handle_t *pamh = NULL; - * Global variables - */ - const char *Prog; --FILE *shadow_logfd = NULL; - - static const char *hostname = ""; - static /*@null@*/ /*@only@*/char *username = NULL; -@@ -578,7 +578,8 @@ int main (int argc, char **argv) - - amroot = (getuid () == 0); - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - if (geteuid() != 0) { - fprintf (stderr, _("%s: Cannot possibly work without effective root\n"), Prog); -diff -up shadow-4.9/src/logoutd.c.debug1 shadow-4.9/src/logoutd.c ---- shadow-4.9/src/logoutd.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/src/logoutd.c 2022-01-10 10:45:52.206132965 +0100 -@@ -40,11 +40,11 @@ - #include - #include "defines.h" - #include "prototypes.h" -+#include "shadowlog.h" - /* - * Global variables - */ - const char *Prog; --FILE *shadow_logfd = NULL; - - #ifndef DEFAULT_HUP_MESG - #define DEFAULT_HUP_MESG _("login time exceeded\n\n") -@@ -188,7 +188,8 @@ int main (int argc, char **argv) - * Start syslogging everything - */ - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - OPENLOG ("logoutd"); - -diff -up shadow-4.9/src/newgidmap.c.debug1 shadow-4.9/src/newgidmap.c ---- shadow-4.9/src/newgidmap.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/src/newgidmap.c 2022-01-10 10:45:52.206132965 +0100 -@@ -41,12 +41,12 @@ - #include "subordinateio.h" - #include "getdef.h" - #include "idmapping.h" -+#include "shadowlog.h" - - /* - * Global variables - */ - const char *Prog; --FILE *shadow_logfd = NULL; - - - static bool verify_range(struct passwd *pw, struct map_range *range, bool *allow_setgroups) -@@ -177,7 +177,8 @@ int main(int argc, char **argv) - bool allow_setgroups = false; - - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - /* - * The valid syntax are -diff -up shadow-4.9/src/newgrp.c.debug1 shadow-4.9/src/newgrp.c ---- shadow-4.9/src/newgrp.c.debug1 2022-01-10 10:45:52.199132915 +0100 -+++ shadow-4.9/src/newgrp.c 2022-01-10 10:45:52.206132965 +0100 -@@ -44,12 +44,12 @@ - #include "prototypes.h" - /*@-exitarg@*/ - #include "exitcodes.h" -+#include "shadowlog.h" - - /* - * Global variables - */ - const char *Prog; --FILE *shadow_logfd = NULL; - - extern char **newenvp; - extern char **environ; -@@ -446,7 +446,8 @@ int main (int argc, char **argv) - * don't need to re-exec anything. -- JWP - */ - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - is_newgrp = (strcmp (Prog, "newgrp") == 0); - OPENLOG (is_newgrp ? "newgrp" : "sg"); - argc--; -diff -up shadow-4.9/src/new_subid_range.c.debug1 shadow-4.9/src/new_subid_range.c ---- shadow-4.9/src/new_subid_range.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/src/new_subid_range.c 2022-01-10 10:45:52.206132965 +0100 -@@ -3,11 +3,11 @@ - #include "subid.h" - #include "stdlib.h" - #include "prototypes.h" -+#include "shadowlog.h" - - /* Test program for the subid creation routine */ - - const char *Prog; --FILE *shadow_logfd = NULL; - - void usage(void) - { -@@ -27,7 +27,8 @@ int main(int argc, char *argv[]) - bool ok; - - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - while ((c = getopt(argc, argv, "gn")) != EOF) { - switch(c) { - case 'n': makenew = true; break; -diff -up shadow-4.9/src/newuidmap.c.debug1 shadow-4.9/src/newuidmap.c ---- shadow-4.9/src/newuidmap.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/src/newuidmap.c 2022-01-10 10:45:52.206132965 +0100 -@@ -41,12 +41,12 @@ - #include "subordinateio.h" - #include "getdef.h" - #include "idmapping.h" -+#include "shadowlog.h" - - /* - * Global variables - */ - const char *Prog; --FILE *shadow_logfd = NULL; - - static bool verify_range(struct passwd *pw, struct map_range *range) - { -@@ -107,7 +107,8 @@ int main(int argc, char **argv) - int written; - - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - /* - * The valid syntax are -diff -up shadow-4.9/src/newusers.c.debug1 shadow-4.9/src/newusers.c ---- shadow-4.9/src/newusers.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/src/newusers.c 2022-01-10 10:45:52.207132972 +0100 -@@ -70,12 +70,12 @@ - #include "subordinateio.h" - #endif /* ENABLE_SUBIDS */ - #include "chkname.h" -+#include "shadowlog.h" - - /* - * Global variables - */ - const char *Prog; --FILE *shadow_logfd = NULL; - - static bool rflg = false; /* create a system account */ - #ifndef USE_PAM -@@ -1071,7 +1071,8 @@ int main (int argc, char **argv) - #endif /* USE_PAM */ - - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - (void) setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); -diff -up shadow-4.9/src/passwd.c.debug1 shadow-4.9/src/passwd.c ---- shadow-4.9/src/passwd.c.debug1 2022-01-10 10:45:52.189132844 +0100 -+++ shadow-4.9/src/passwd.c 2022-01-10 10:45:52.207132972 +0100 -@@ -50,6 +50,7 @@ - #include "pwauth.h" - #include "pwio.h" - #include "shadowio.h" -+#include "shadowlog.h" - - /* - * exit status values -@@ -66,7 +67,6 @@ - * Global variables - */ - const char *Prog; /* Program name */ --FILE *shadow_logfd = NULL; - - static char *name; /* The name of user whose password is being changed */ - static char *myname; /* The current user's name */ -@@ -761,7 +761,8 @@ int main (int argc, char **argv) - * most error messages. - */ - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - (void) setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); -diff -up shadow-4.9/src/pwck.c.debug1 shadow-4.9/src/pwck.c ---- shadow-4.9/src/pwck.c.debug1 2022-01-10 10:45:52.198132908 +0100 -+++ shadow-4.9/src/pwck.c 2022-01-10 10:45:52.207132972 +0100 -@@ -52,6 +52,7 @@ - #ifdef WITH_TCB - #include "tcbfuncs.h" - #endif /* WITH_TCB */ -+#include "shadowlog.h" - - /* - * Exit codes -@@ -70,7 +71,6 @@ - * Global variables - */ - const char *Prog; --FILE *shadow_logfd = NULL; - - static bool use_system_pw_file = true; - static bool use_system_spw_file = true; -@@ -857,7 +857,8 @@ int main (int argc, char **argv) - * Get my name so that I can use it to report errors. - */ - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - (void) setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); -diff -up shadow-4.9/src/pwconv.c.debug1 shadow-4.9/src/pwconv.c ---- shadow-4.9/src/pwconv.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/src/pwconv.c 2022-01-10 10:45:52.207132972 +0100 -@@ -73,6 +73,7 @@ - #include "shadowio.h" - #include "nscd.h" - #include "sssd.h" -+#include "shadowlog.h" - - /* - * exit status values -@@ -89,7 +90,6 @@ - * Global variables - */ - const char *Prog; --FILE *shadow_logfd = NULL; - - static bool spw_locked = false; - static bool pw_locked = false; -@@ -177,7 +177,8 @@ int main (int argc, char **argv) - struct spwd spent; - - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - (void) setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); -diff -up shadow-4.9/src/pwunconv.c.debug1 shadow-4.9/src/pwunconv.c ---- shadow-4.9/src/pwunconv.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/src/pwunconv.c 2022-01-10 10:45:52.207132972 +0100 -@@ -48,12 +48,12 @@ - #include "shadowio.h" - /*@-exitarg@*/ - #include "exitcodes.h" -+#include "shadowlog.h" - - /* - * Global variables - */ - const char *Prog; --FILE *shadow_logfd = NULL; - - static bool spw_locked = false; - static bool pw_locked = false; -@@ -138,7 +138,8 @@ int main (int argc, char **argv) - const struct spwd *spwd; - - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - (void) setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); -diff -up shadow-4.9/src/su.c.debug1 shadow-4.9/src/su.c ---- shadow-4.9/src/su.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/src/su.c 2022-01-10 10:45:52.207132972 +0100 -@@ -77,12 +77,12 @@ - #endif /* USE_PAM */ - /*@-exitarg@*/ - #include "exitcodes.h" -+#include "shadowlog.h" - - /* - * Global variables - */ - const char *Prog; --FILE *shadow_logfd = NULL; - static /*@observer@*/const char *caller_tty = NULL; /* Name of tty SU is run from */ - static bool caller_is_root = false; - static uid_t caller_uid; -@@ -717,7 +717,8 @@ static void save_caller_context (char ** - * most error messages. - */ - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - caller_uid = getuid (); - caller_is_root = (caller_uid == 0); -diff -up shadow-4.9/src/sulogin.c.debug1 shadow-4.9/src/sulogin.c ---- shadow-4.9/src/sulogin.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/src/sulogin.c 2022-01-10 10:45:52.207132972 +0100 -@@ -45,12 +45,12 @@ - #include "pwauth.h" - /*@-exitarg@*/ - #include "exitcodes.h" -+#include "shadowlog.h" - - /* - * Global variables - */ - const char *Prog; --FILE *shadow_logfd = NULL; - - static char name[BUFSIZ]; - static char pass[BUFSIZ]; -@@ -107,7 +107,8 @@ static RETSIGTYPE catch_signals (unused - #endif - - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - (void) setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); - (void) textdomain (PACKAGE); -diff -up shadow-4.9/src/useradd.c.debug1 shadow-4.9/src/useradd.c ---- shadow-4.9/src/useradd.c.debug1 2022-01-10 10:45:52.197132901 +0100 -+++ shadow-4.9/src/useradd.c 2022-01-10 10:45:52.207132972 +0100 -@@ -78,6 +78,7 @@ - #ifdef WITH_TCB - #include "tcbfuncs.h" - #endif -+#include "shadowlog.h" - - #ifndef SKEL_DIR - #define SKEL_DIR "/etc/skel" -@@ -96,7 +97,6 @@ - * Global variables - */ - const char *Prog; --FILE *shadow_logfd = NULL; - - /* - * These defaults are used if there is no defaults file. -@@ -2359,7 +2359,8 @@ int main (int argc, char **argv) - * Get my name so that I can use it to report errors. - */ - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - (void) setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); -diff -up shadow-4.9/src/userdel.c.debug1 shadow-4.9/src/userdel.c ---- shadow-4.9/src/userdel.c.debug1 2022-01-10 10:45:52.186132823 +0100 -+++ shadow-4.9/src/userdel.c 2022-01-10 10:45:52.208132979 +0100 -@@ -72,6 +72,7 @@ - #ifdef ENABLE_SUBIDS - #include "subordinateio.h" - #endif /* ENABLE_SUBIDS */ -+#include "shadowlog.h" - - /* - * exit status values -@@ -91,7 +92,6 @@ - * Global variables - */ - const char *Prog; --FILE *shadow_logfd = NULL; - - static char *user_name; - static uid_t user_id; -@@ -944,7 +944,8 @@ int main (int argc, char **argv) - * Get my name so that I can use it to report errors. - */ - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - (void) setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); - (void) textdomain (PACKAGE); -diff -up shadow-4.9/src/usermod.c.debug1 shadow-4.9/src/usermod.c ---- shadow-4.9/src/usermod.c.debug1 2022-01-10 10:45:52.193132872 +0100 -+++ shadow-4.9/src/usermod.c 2022-01-10 10:45:52.208132979 +0100 -@@ -74,6 +74,7 @@ - #ifdef WITH_TCB - #include "tcbfuncs.h" - #endif -+#include "shadowlog.h" - - /* - * exit status values -@@ -105,7 +106,6 @@ - * Global variables - */ - const char *Prog; --FILE *shadow_logfd = NULL; - - static char *user_name; - static char *user_newname; -@@ -2172,7 +2172,8 @@ int main (int argc, char **argv) - * Get my name so that I can use it to report errors. - */ - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - (void) setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); -diff -up shadow-4.9/src/vipw.c.debug1 shadow-4.9/src/vipw.c ---- shadow-4.9/src/vipw.c.debug1 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/src/vipw.c 2022-01-10 10:45:52.208132979 +0100 -@@ -53,6 +53,7 @@ - #include - #include "tcbfuncs.h" - #endif /* WITH_TCB */ -+#include "shadowlog.h" - - #define MSG_WARN_EDIT_OTHER_FILE _( \ - "You have modified %s.\n"\ -@@ -63,7 +64,6 @@ - * Global variables - */ - const char *Prog; --FILE *shadow_logfd = NULL; - - static const char *filename, *fileeditname; - static bool filelocked = false; -@@ -482,7 +482,8 @@ int main (int argc, char **argv) - bool do_vipw; - - Prog = Basename (argv[0]); -- shadow_logfd = stderr; -+ log_set_progname(Prog); -+ log_set_logfd(stderr); - - (void) setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); diff --git a/shadow-4.9-manfix.patch b/shadow-4.9-manfix.patch deleted file mode 100644 index 46cba1a..0000000 --- a/shadow-4.9-manfix.patch +++ /dev/null @@ -1,180 +0,0 @@ -diff -up shadow-4.8.1/man/groupmems.8.xml.manfix shadow-4.8.1/man/groupmems.8.xml ---- shadow-4.8.1/man/groupmems.8.xml.manfix 2020-03-17 15:34:48.750414984 +0100 -+++ shadow-4.8.1/man/groupmems.8.xml 2020-03-17 15:41:13.383588722 +0100 -@@ -179,20 +179,10 @@ - - SETUP - -- The groupmems executable should be in mode -- 2710 as user root and in group -- groups. The system administrator can add users to -- group groups to allow or disallow them using the -- groupmems utility to manage their own group -- membership list. -+ In this operating system the groupmems executable -+ is not setuid and regular users cannot use it to manipulate -+ the membership of their own group. - -- -- -- $ groupadd -r groups -- $ chmod 2710 groupmems -- $ chown root.groups groupmems -- $ groupmems -g groups -a gk4 -- - - - -diff -up shadow-4.8.1/man/ja/man5/login.defs.5.manfix shadow-4.8.1/man/ja/man5/login.defs.5 ---- shadow-4.8.1/man/ja/man5/login.defs.5.manfix 2019-07-23 17:26:08.000000000 +0200 -+++ shadow-4.8.1/man/ja/man5/login.defs.5 2020-03-17 15:34:48.750414984 +0100 -@@ -147,10 +147,6 @@ 以下の参照表は、 - shadow パスワード機能のどのプログラムが - どのパラメータを使用するかを示したものである。 - .na --.IP chfn 12 --CHFN_AUTH CHFN_RESTRICT --.IP chsh 12 --CHFN_AUTH - .IP groupadd 12 - GID_MAX GID_MIN - .IP newusers 12 -diff -up shadow-4.8.1/man/login.defs.5.xml.manfix shadow-4.8.1/man/login.defs.5.xml ---- shadow-4.8.1/man/login.defs.5.xml.manfix 2020-01-17 16:47:56.000000000 +0100 -+++ shadow-4.8.1/man/login.defs.5.xml 2020-03-17 15:34:48.750414984 +0100 -@@ -164,6 +164,17 @@ - long numeric parameters is machine-dependent. - - -+ -+ Please note that the parameters in this configuration file control the -+ behavior of the tools from the shadow-utils component. None of these -+ tools uses the PAM mechanism, and the utilities that use PAM (such as the -+ passwd command) should be configured elsewhere. The only values that -+ affect PAM modules are ENCRYPT_METHOD and SHA_CRYPT_MAX_ROUNDS -+ for pam_unix module, FAIL_DELAY for pam_faildelay module, -+ and UMASK for pam_umask module. Refer to -+ pam(8) for more information. -+ -+ - The following configuration items are provided: - - -@@ -256,16 +267,6 @@ - - - -- chfn -- -- -- CHFN_AUTH -- CHFN_RESTRICT -- LOGIN_STRING -- -- -- -- - chgpasswd - - -@@ -286,14 +287,6 @@ - - - -- -- chsh -- -- -- CHSH_AUTH LOGIN_STRING -- -- -- - - - -@@ -359,34 +352,6 @@ - LASTLOG_UID_MAX - - -- -- login -- -- -- CONSOLE -- CONSOLE_GROUPS DEFAULT_HOME -- ENV_HZ ENV_PATH ENV_SUPATH -- ENV_TZ ENVIRON_FILE -- ERASECHAR FAIL_DELAY -- FAILLOG_ENAB -- FAKE_SHELL -- FTMP_FILE -- HUSHLOGIN_FILE -- ISSUE_FILE -- KILLCHAR -- LASTLOG_ENAB LASTLOG_UID_MAX -- LOGIN_RETRIES -- LOGIN_STRING -- LOGIN_TIMEOUT LOG_OK_LOGINS LOG_UNKFAIL_ENAB -- MAIL_CHECK_ENAB MAIL_DIR MAIL_FILE -- MOTD_FILE NOLOGINS_FILE PORTTIME_CHECKS_ENAB -- QUOTAS_ENAB -- TTYGROUP TTYPERM TTYTYPE_FILE -- ULIMIT UMASK -- USERGROUPS_ENAB -- -- -- - - - newgrp / sg -@@ -415,17 +380,6 @@ - - - -- -- passwd -- -- -- ENCRYPT_METHOD MD5_CRYPT_ENAB OBSCURE_CHECKS_ENAB -- PASS_ALWAYS_WARN PASS_CHANGE_TRIES PASS_MAX_LEN PASS_MIN_LEN -- SHA_CRYPT_MAX_ROUNDS -- SHA_CRYPT_MIN_ROUNDS -- -- -- - - pwck - -@@ -452,32 +406,6 @@ - - - -- -- su -- -- -- CONSOLE -- CONSOLE_GROUPS DEFAULT_HOME -- ENV_HZ ENVIRON_FILE -- ENV_PATH ENV_SUPATH -- ENV_TZ LOGIN_STRING MAIL_CHECK_ENAB -- MAIL_DIR MAIL_FILE QUOTAS_ENAB -- SULOG_FILE SU_NAME -- SU_WHEEL_ONLY -- SYSLOG_SU_ENAB -- USERGROUPS_ENAB -- -- -- -- -- sulogin -- -- -- ENV_HZ -- ENV_TZ -- -- -- - - useradd - diff --git a/shadow-4.9-move-create-home.patch b/shadow-4.9-move-create-home.patch deleted file mode 100644 index 0ed6ea7..0000000 --- a/shadow-4.9-move-create-home.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 09c752f00f9dfc610f66d68be38c9e5be8ca7f15 Mon Sep 17 00:00:00 2001 -From: Iker Pedrosa -Date: Fri, 8 Oct 2021 13:09:59 +0200 -Subject: [PATCH] useradd: create directories after the SELinux user - -Create the home and mail folders after the SELinux user has been set for -the added user. This will allow the folders to be created with the -SELinux user label. - -Signed-off-by: Iker Pedrosa ---- - src/useradd.c | 46 +++++++++++++++++++++++----------------------- - 1 file changed, 23 insertions(+), 23 deletions(-) - -diff --git a/src/useradd.c b/src/useradd.c -index 6269c01c..b463a170 100644 ---- a/src/useradd.c -+++ b/src/useradd.c -@@ -2670,27 +2670,12 @@ int main (int argc, char **argv) - - usr_update (); - -- if (mflg) { -- create_home (); -- if (home_added) { -- copy_tree (def_template, prefix_user_home, false, false, -- (uid_t)-1, user_id, (gid_t)-1, user_gid); -- } else { -- fprintf (stderr, -- _("%s: warning: the home directory %s already exists.\n" -- "%s: Not copying any file from skel directory into it.\n"), -- Prog, user_home, Prog); -- } -- -- } -- -- /* Do not create mail directory for system accounts */ -- if (!rflg) { -- create_mail (); -- } -- - close_files (); - -+ nscd_flush_cache ("passwd"); -+ nscd_flush_cache ("group"); -+ sssd_flush_cache (SSSD_DB_PASSWD | SSSD_DB_GROUP); -+ - /* - * tallylog_reset needs to be able to lookup - * a valid existing user name, -@@ -2716,15 +2701,30 @@ int main (int argc, char **argv) - } - #endif /* WITH_SELINUX */ - -+ if (mflg) { -+ create_home (); -+ if (home_added) { -+ copy_tree (def_template, prefix_user_home, false, false, -+ (uid_t)-1, user_id, (gid_t)-1, user_gid); -+ } else { -+ fprintf (stderr, -+ _("%s: warning: the home directory %s already exists.\n" -+ "%s: Not copying any file from skel directory into it.\n"), -+ Prog, user_home, Prog); -+ } -+ -+ } -+ -+ /* Do not create mail directory for system accounts */ -+ if (!rflg) { -+ create_mail (); -+ } -+ - if (run_parts ("/etc/shadow-maint/useradd-post.d", (char*)user_name, - "useradd")) { - exit(1); - } - -- nscd_flush_cache ("passwd"); -- nscd_flush_cache ("group"); -- sssd_flush_cache (SSSD_DB_PASSWD | SSSD_DB_GROUP); -- - return E_SUCCESS; - } - --- -2.31.1 - diff --git a/shadow-4.9-newgrp-fix-segmentation-fault.patch b/shadow-4.9-newgrp-fix-segmentation-fault.patch deleted file mode 100644 index 49332a1..0000000 --- a/shadow-4.9-newgrp-fix-segmentation-fault.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 497e90751bc0d95cc998b0f06305040563903948 Mon Sep 17 00:00:00 2001 -From: Iker Pedrosa -Date: Wed, 10 Nov 2021 12:02:04 +0100 -Subject: [PATCH] newgrp: fix segmentation fault - -Fix segmentation fault in newgrp when xgetspnam() returns a NULL value -that is immediately freed. - -The error was committed in -https://github.com/shadow-maint/shadow/commit/e65cc6aebcb4132fa413f00a905216a5b35b3d57 - -Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2019553 - -Signed-off-by: Iker Pedrosa ---- - src/newgrp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/newgrp.c b/src/newgrp.c -index 730f47e8..566f1c89 100644 ---- a/src/newgrp.c -+++ b/src/newgrp.c -@@ -163,8 +163,8 @@ static void check_perms (const struct group *grp, - spwd = xgetspnam (pwd->pw_name); - if (NULL != spwd) { - pwd->pw_passwd = xstrdup (spwd->sp_pwdp); -+ spw_free (spwd); - } -- spw_free (spwd); - - if ((pwd->pw_passwd[0] == '\0') && (grp->gr_passwd[0] != '\0')) { - needspasswd = true; --- -2.31.1 - diff --git a/shadow-4.9-newuidmap-libeconf-dependency.patch b/shadow-4.9-newuidmap-libeconf-dependency.patch deleted file mode 100644 index a1907a6..0000000 --- a/shadow-4.9-newuidmap-libeconf-dependency.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/Makefile.am b/src/Makefile.am -index 7c1a3491..6cc873be 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -96,8 +96,8 @@ LIBCRYPT_NOPAM = $(LIBCRYPT) - endif - - chage_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF) --newuidmap_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBCAP) -ldl --newgidmap_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBCAP) -ldl -+newuidmap_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBCAP) $(LIBECONF) -ldl -+newgidmap_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBCAP) $(LIBECONF) -ldl - chfn_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT_NOPAM) $(LIBSKEY) $(LIBMD) $(LIBECONF) - chgpasswd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT) $(LIBECONF) - chsh_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT_NOPAM) $(LIBSKEY) $(LIBMD) $(LIBECONF) diff --git a/shadow-4.9-nss-get-shadow-logfd-with-log-get-logfd.patch b/shadow-4.9-nss-get-shadow-logfd-with-log-get-logfd.patch deleted file mode 100644 index 4d8e792..0000000 --- a/shadow-4.9-nss-get-shadow-logfd-with-log-get-logfd.patch +++ /dev/null @@ -1,48 +0,0 @@ -From e101219ad71de11da3fdd1b3ec2620fd1a97b92c Mon Sep 17 00:00:00 2001 -From: Iker Pedrosa -Date: Mon, 10 Jan 2022 15:30:28 +0100 -Subject: [PATCH] nss: get shadow_logfd with log_get_logfd() - -If /etc/nsswitch.conf doesn't exist podman crashes because shadow_logfd -is NULL. In order to avoid that load the log file descriptor with the -log_get_logfd() helper function. - -Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2038811 - -Signed-off-by: Iker Pedrosa ---- - lib/nss.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/nss.c b/lib/nss.c -index 02742902..06fa48e5 100644 ---- a/lib/nss.c -+++ b/lib/nss.c -@@ -9,6 +9,7 @@ - #include "prototypes.h" - #include "../libsubid/subid.h" - #include "shadowlog_internal.h" -+#include "shadowlog.h" - - #define NSSWITCH "/etc/nsswitch.conf" - -@@ -42,6 +43,7 @@ void nss_init(const char *nsswitch_path) { - FILE *nssfp = NULL; - char *line = NULL, *p, *token, *saveptr; - size_t len = 0; -+ FILE *shadow_logfd = log_get_logfd(); - - if (atomic_flag_test_and_set(&nss_init_started)) { - // Another thread has started nss_init, wait for it to complete -@@ -57,7 +59,7 @@ void nss_init(const char *nsswitch_path) { - // subid: files - nssfp = fopen(nsswitch_path, "r"); - if (!nssfp) { -- fprintf(shadow_logfd, "Failed opening %s: %m", nsswitch_path); -+ fprintf(shadow_logfd, "Failed opening %s: %m\n", nsswitch_path); - atomic_store(&nss_init_completed, true); - return; - } --- -2.34.1 - diff --git a/shadow-4.9-null-tm.patch b/shadow-4.9-null-tm.patch deleted file mode 100644 index 249b27b..0000000 --- a/shadow-4.9-null-tm.patch +++ /dev/null @@ -1,70 +0,0 @@ -Index: shadow-4.5/src/chage.c -=================================================================== ---- shadow-4.5.orig/src/chage.c -+++ shadow-4.5/src/chage.c -@@ -168,6 +168,10 @@ static void date_to_str (char *buf, size - struct tm *tp; - - tp = gmtime (&date); -+ if (tp == NULL) { -+ (void) snprintf (buf, maxsize, "(unknown)"); -+ return; -+ } - #ifdef HAVE_STRFTIME - (void) strftime (buf, maxsize, "%Y-%m-%d", tp); - #else -Index: shadow-4.5/src/lastlog.c -=================================================================== ---- shadow-4.5.orig/src/lastlog.c -+++ shadow-4.5/src/lastlog.c -@@ -158,13 +158,17 @@ static void print_one (/*@null@*/const s - - ll_time = ll.ll_time; - tm = localtime (&ll_time); -+ if (tm == NULL) { -+ cp = "(unknown)"; -+ } else { - #ifdef HAVE_STRFTIME -- strftime (ptime, sizeof (ptime), "%a %b %e %H:%M:%S %z %Y", tm); -- cp = ptime; -+ strftime (ptime, sizeof (ptime), "%a %b %e %H:%M:%S %z %Y", tm); -+ cp = ptime; - #else -- cp = asctime (tm); -- cp[24] = '\0'; -+ cp = asctime (tm); -+ cp[24] = '\0'; - #endif -+ } - - if (ll.ll_time == (time_t) 0) { - cp = _("**Never logged in**\0"); -Index: shadow-4.5/src/passwd.c -=================================================================== ---- shadow-4.5.orig/src/passwd.c -+++ shadow-4.5/src/passwd.c -@@ -455,6 +455,9 @@ static /*@observer@*/const char *date_to - struct tm *tm; - - tm = gmtime (&t); -+ if (tm == NULL) { -+ return "(unknown)"; -+ } - #ifdef HAVE_STRFTIME - (void) strftime (buf, sizeof buf, "%m/%d/%Y", tm); - #else /* !HAVE_STRFTIME */ -Index: shadow-4.5/src/usermod.c -=================================================================== ---- shadow-4.5.orig/src/usermod.c -+++ shadow-4.5/src/usermod.c -@@ -210,6 +210,10 @@ static void date_to_str (/*@unique@*//*@ - } else { - time_t t = (time_t) date; - tp = gmtime (&t); -+ if (tp == NULL) { -+ strncpy (buf, "unknown", maxsize); -+ return; -+ } - #ifdef HAVE_STRFTIME - strftime (buf, maxsize, "%Y-%m-%d", tp); - #else diff --git a/shadow-4.9-pwck-fix-segfault-when-calling-fprintf.patch b/shadow-4.9-pwck-fix-segfault-when-calling-fprintf.patch deleted file mode 100644 index e7761b7..0000000 --- a/shadow-4.9-pwck-fix-segfault-when-calling-fprintf.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d8e54618feea201987c1f3cb402ed50d1d8b604f Mon Sep 17 00:00:00 2001 -From: Iker Pedrosa -Date: Mon, 15 Nov 2021 12:40:15 +0100 -Subject: [PATCH] pwck: fix segfault when calling fprintf() - -As shadow_logfd variable is not set at the beginning of the program if -something fails and fprintf() is called a segmentation fault happens. - -Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2021339 - -Signed-off-by: Iker Pedrosa ---- - src/pwck.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/pwck.c b/src/pwck.c -index 4248944a..4ce86af2 100644 ---- a/src/pwck.c -+++ b/src/pwck.c -@@ -857,6 +857,7 @@ int main (int argc, char **argv) - * Get my name so that I can use it to report errors. - */ - Prog = Basename (argv[0]); -+ shadow_logfd = stderr; - - (void) setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); --- -2.31.1 - diff --git a/shadow-4.9-redhat.patch b/shadow-4.9-redhat.patch deleted file mode 100644 index 9dfb3e8..0000000 --- a/shadow-4.9-redhat.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -up shadow-4.9/src/useradd.c.redhat shadow-4.9/src/useradd.c ---- shadow-4.9/src/useradd.c.redhat 2021-07-22 23:55:35.000000000 +0200 -+++ shadow-4.9/src/useradd.c 2021-08-02 11:45:11.942867250 +0200 -@@ -104,7 +104,7 @@ FILE *shadow_logfd = NULL; - static gid_t def_group = 1000; - static const char *def_gname = "other"; - static const char *def_home = "/home"; --static const char *def_shell = "/bin/bash"; -+static const char *def_shell = "/sbin/nologin"; - static const char *def_template = SKEL_DIR; - static const char *def_create_mail_spool = "yes"; - -@@ -114,7 +114,7 @@ static const char *def_expire = ""; - #define VALID(s) (strcspn (s, ":\n") == strlen (s)) - - static const char *user_name = ""; --static const char *user_pass = "!"; -+static const char *user_pass = "!!"; - static uid_t user_id; - static gid_t user_gid; - static const char *user_comment = ""; -@@ -1204,9 +1204,9 @@ static void process_flags (int argc, cha - }; - while ((c = getopt_long (argc, argv, - #ifdef WITH_SELINUX -- "b:c:d:De:f:g:G:hk:K:lmMNop:rR:P:s:u:UZ:", -+ "b:c:d:De:f:g:G:hk:K:lmMnNop:rR:P:s:u:UZ:", - #else /* !WITH_SELINUX */ -- "b:c:d:De:f:g:G:hk:K:lmMNop:rR:P:s:u:U", -+ "b:c:d:De:f:g:G:hk:K:lmMnNop:rR:P:s:u:U", - #endif /* !WITH_SELINUX */ - long_options, NULL)) != -1) { - switch (c) { -@@ -1363,6 +1363,7 @@ static void process_flags (int argc, cha - case 'M': - Mflg = true; - break; -+ case 'n': - case 'N': - Nflg = true; - break; diff --git a/shadow-4.9-rename-prog-to-shadow-progname.patch b/shadow-4.9-rename-prog-to-shadow-progname.patch deleted file mode 100644 index d3a73a3..0000000 --- a/shadow-4.9-rename-prog-to-shadow-progname.patch +++ /dev/null @@ -1,507 +0,0 @@ -diff -up shadow-4.9/lib/commonio.c.debug2 shadow-4.9/lib/commonio.c ---- shadow-4.9/lib/commonio.c.debug2 2022-01-10 10:57:47.535238522 +0100 -+++ shadow-4.9/lib/commonio.c 2022-01-10 10:57:47.544238586 +0100 -@@ -147,7 +147,7 @@ static int do_lock_file (const char *fil - if (log) { - (void) fprintf (shadow_logfd, - "%s: %s: %s\n", -- Prog, file, strerror (errno)); -+ shadow_progname, file, strerror (errno)); - } - return 0; - } -@@ -159,7 +159,7 @@ static int do_lock_file (const char *fil - if (log) { - (void) fprintf (shadow_logfd, - "%s: %s file write error: %s\n", -- Prog, file, strerror (errno)); -+ shadow_progname, file, strerror (errno)); - } - (void) close (fd); - unlink (file); -@@ -169,7 +169,7 @@ static int do_lock_file (const char *fil - if (log) { - (void) fprintf (shadow_logfd, - "%s: %s file sync error: %s\n", -- Prog, file, strerror (errno)); -+ shadow_progname, file, strerror (errno)); - } - (void) close (fd); - unlink (file); -@@ -182,7 +182,7 @@ static int do_lock_file (const char *fil - if ((0==retval) && log) { - (void) fprintf (shadow_logfd, - "%s: %s: lock file already used\n", -- Prog, file); -+ shadow_progname, file); - } - unlink (file); - return retval; -@@ -193,7 +193,7 @@ static int do_lock_file (const char *fil - if (log) { - (void) fprintf (shadow_logfd, - "%s: %s: %s\n", -- Prog, lock, strerror (errno)); -+ shadow_progname, lock, strerror (errno)); - } - unlink (file); - errno = EINVAL; -@@ -205,7 +205,7 @@ static int do_lock_file (const char *fil - if (log) { - (void) fprintf (shadow_logfd, - "%s: existing lock file %s without a PID\n", -- Prog, lock); -+ shadow_progname, lock); - } - unlink (file); - errno = EINVAL; -@@ -216,7 +216,7 @@ static int do_lock_file (const char *fil - if (log) { - (void) fprintf (shadow_logfd, - "%s: existing lock file %s with an invalid PID '%s'\n", -- Prog, lock, buf); -+ shadow_progname, lock, buf); - } - unlink (file); - errno = EINVAL; -@@ -226,7 +226,7 @@ static int do_lock_file (const char *fil - if (log) { - (void) fprintf (shadow_logfd, - "%s: lock %s already used by PID %lu\n", -- Prog, lock, (unsigned long) pid); -+ shadow_progname, lock, (unsigned long) pid); - } - unlink (file); - errno = EEXIST; -@@ -236,7 +236,7 @@ static int do_lock_file (const char *fil - if (log) { - (void) fprintf (shadow_logfd, - "%s: cannot get lock %s: %s\n", -- Prog, lock, strerror (errno)); -+ shadow_progname, lock, strerror (errno)); - } - unlink (file); - return 0; -@@ -248,13 +248,13 @@ static int do_lock_file (const char *fil - if ((0==retval) && log) { - (void) fprintf (shadow_logfd, - "%s: %s: lock file already used\n", -- Prog, file); -+ shadow_progname, file); - } - } else { - if (log) { - (void) fprintf (shadow_logfd, - "%s: cannot get lock %s: %s\n", -- Prog, lock, strerror (errno)); -+ shadow_progname, lock, strerror (errno)); - } - } - -@@ -449,7 +449,7 @@ int commonio_lock (struct commonio_db *d - if (geteuid () != 0) { - (void) fprintf (shadow_logfd, - "%s: Permission denied.\n", -- Prog); -+ shadow_progname); - } - return 0; /* failure */ - } -@@ -484,7 +484,7 @@ int commonio_lock (struct commonio_db *d - /* no unnecessary retries on "permission denied" errors */ - if (geteuid () != 0) { - (void) fprintf (shadow_logfd, "%s: Permission denied.\n", -- Prog); -+ shadow_progname); - return 0; - } - } -diff -up shadow-4.9/lib/nscd.c.debug2 shadow-4.9/lib/nscd.c ---- shadow-4.9/lib/nscd.c.debug2 2022-01-10 10:57:47.537238536 +0100 -+++ shadow-4.9/lib/nscd.c 2022-01-10 10:57:47.544238586 +0100 -@@ -26,7 +26,7 @@ int nscd_flush_cache (const char *servic - - if (run_command (cmd, spawnedArgs, spawnedEnv, &status) != 0) { - /* run_command writes its own more detailed message. */ -- (void) fprintf (shadow_logfd, _(MSG_NSCD_FLUSH_CACHE_FAILED), Prog); -+ (void) fprintf (shadow_logfd, _(MSG_NSCD_FLUSH_CACHE_FAILED), shadow_progname); - return -1; - } - -@@ -34,7 +34,7 @@ int nscd_flush_cache (const char *servic - if (!WIFEXITED (status)) { - (void) fprintf (shadow_logfd, - _("%s: nscd did not terminate normally (signal %d)\n"), -- Prog, WTERMSIG (status)); -+ shadow_progname, WTERMSIG (status)); - return -1; - } else if (code == E_CMD_NOTFOUND) { - /* nscd is not installed, or it is installed but uses an -@@ -45,8 +45,8 @@ int nscd_flush_cache (const char *servic - return 0; - } else if (code != 0) { - (void) fprintf (shadow_logfd, _("%s: nscd exited with status %d\n"), -- Prog, code); -- (void) fprintf (shadow_logfd, _(MSG_NSCD_FLUSH_CACHE_FAILED), Prog); -+ shadow_progname, code); -+ (void) fprintf (shadow_logfd, _(MSG_NSCD_FLUSH_CACHE_FAILED), shadow_progname); - return -1; - } - -diff -up shadow-4.9/lib/selinux.c.debug2 shadow-4.9/lib/selinux.c ---- shadow-4.9/lib/selinux.c.debug2 2022-01-10 10:57:47.538238543 +0100 -+++ shadow-4.9/lib/selinux.c 2022-01-10 10:57:47.544238586 +0100 -@@ -216,7 +216,7 @@ int check_selinux_permit (const char *pe - if (getprevcon_raw (&user_context_raw) != 0) { - fprintf (shadow_logfd, - _("%s: can not get previous SELinux process context: %s\n"), -- Prog, strerror (errno)); -+ shadow_progname, strerror (errno)); - SYSLOG ((LOG_WARN, - "can not get previous SELinux process context: %s", - strerror (errno))); -diff -up shadow-4.9/lib/shadowlog.c.debug2 shadow-4.9/lib/shadowlog.c ---- shadow-4.9/lib/shadowlog.c.debug2 2022-01-10 10:57:47.538238543 +0100 -+++ shadow-4.9/lib/shadowlog.c 2022-01-10 10:57:47.544238586 +0100 -@@ -2,14 +2,17 @@ - - #include "lib/shadowlog_internal.h" - -+const char *shadow_progname; -+FILE *shadow_logfd; -+ - void log_set_progname(const char *progname) - { -- Prog = progname; -+ shadow_progname = progname; - } - - const char *log_get_progname(void) - { -- return Prog; -+ return shadow_progname; - } - - void log_set_logfd(FILE *fd) -diff -up shadow-4.9/lib/shadowlog_internal.h.debug2 shadow-4.9/lib/shadowlog_internal.h ---- shadow-4.9/lib/shadowlog_internal.h.debug2 2022-01-10 10:57:47.538238543 +0100 -+++ shadow-4.9/lib/shadowlog_internal.h 2022-01-10 10:57:47.544238586 +0100 -@@ -1,2 +1,2 @@ --const char *Prog; /* Program name showed in error messages */ --FILE *shadow_logfd; /* file descripter to which error messages are printed */ -+extern const char *shadow_progname; /* Program name showed in error messages */ -+extern FILE *shadow_logfd; /* file descripter to which error messages are printed */ -diff -up shadow-4.9/lib/spawn.c.debug2 shadow-4.9/lib/spawn.c ---- shadow-4.9/lib/spawn.c.debug2 2022-01-10 10:57:47.538238543 +0100 -+++ shadow-4.9/lib/spawn.c 2022-01-10 10:57:47.544238586 +0100 -@@ -60,11 +60,11 @@ int run_command (const char *cmd, const - exit (E_CMD_NOTFOUND); - } - fprintf (shadow_logfd, "%s: cannot execute %s: %s\n", -- Prog, cmd, strerror (errno)); -+ shadow_progname, cmd, strerror (errno)); - exit (E_CMD_NOEXEC); - } else if ((pid_t)-1 == pid) { - fprintf (shadow_logfd, "%s: cannot execute %s: %s\n", -- Prog, cmd, strerror (errno)); -+ shadow_progname, cmd, strerror (errno)); - return -1; - } - -@@ -77,7 +77,7 @@ int run_command (const char *cmd, const - - if ((pid_t)-1 == wpid) { - fprintf (shadow_logfd, "%s: waitpid (status: %d): %s\n", -- Prog, *status, strerror (errno)); -+ shadow_progname, *status, strerror (errno)); - return -1; - } - -diff -up shadow-4.9/lib/sssd.c.debug2 shadow-4.9/lib/sssd.c ---- shadow-4.9/lib/sssd.c.debug2 2022-01-10 10:57:47.538238543 +0100 -+++ shadow-4.9/lib/sssd.c 2022-01-10 10:57:47.544238586 +0100 -@@ -48,22 +48,22 @@ int sssd_flush_cache (int dbflags) - free(sss_cache_args); - if (rv != 0) { - /* run_command writes its own more detailed message. */ -- SYSLOG ((LOG_WARN, MSG_SSSD_FLUSH_CACHE_FAILED, Prog)); -+ SYSLOG ((LOG_WARN, MSG_SSSD_FLUSH_CACHE_FAILED, shadow_progname)); - return -1; - } - - code = WEXITSTATUS (status); - if (!WIFEXITED (status)) { - SYSLOG ((LOG_WARN, "%s: sss_cache did not terminate normally (signal %d)", -- Prog, WTERMSIG (status))); -+ shadow_progname, WTERMSIG (status))); - return -1; - } else if (code == E_CMD_NOTFOUND) { - /* sss_cache is not installed, or it is installed but uses an - interpreter that is missing. Probably the former. */ - return 0; - } else if (code != 0) { -- SYSLOG ((LOG_WARN, "%s: sss_cache exited with status %d", Prog, code)); -- SYSLOG ((LOG_WARN, MSG_SSSD_FLUSH_CACHE_FAILED, Prog)); -+ SYSLOG ((LOG_WARN, "%s: sss_cache exited with status %d", shadow_progname, code)); -+ SYSLOG ((LOG_WARN, MSG_SSSD_FLUSH_CACHE_FAILED, shadow_progname)); - return -1; - } - -diff -up shadow-4.9/lib/tcbfuncs.c.debug2 shadow-4.9/lib/tcbfuncs.c ---- shadow-4.9/lib/tcbfuncs.c.debug2 2022-01-10 10:57:47.538238543 +0100 -+++ shadow-4.9/lib/tcbfuncs.c 2022-01-10 10:59:01.228764507 +0100 -@@ -74,7 +74,7 @@ shadowtcb_status shadowtcb_gain_priv (vo - * to exit soon. - */ - #define OUT_OF_MEMORY do { \ -- fprintf (shadow_logfd, _("%s: out of memory\n"), Prog); \ -+ fprintf (shadow_logfd, _("%s: out of memory\n"), shadow_progname); \ - (void) fflush (shadow_logfd); \ - } while (false) - -@@ -120,7 +120,7 @@ static /*@null@*/ char *shadowtcb_path_r - if (lstat (path, &st) != 0) { - fprintf (shadow_logfd, - _("%s: Cannot stat %s: %s\n"), -- Prog, path, strerror (errno)); -+ shadow_progname, path, strerror (errno)); - free (path); - return NULL; - } -@@ -136,7 +136,7 @@ static /*@null@*/ char *shadowtcb_path_r - if (!S_ISLNK (st.st_mode)) { - fprintf (shadow_logfd, - _("%s: %s is neither a directory, nor a symlink.\n"), -- Prog, path); -+ shadow_progname, path); - free (path); - return NULL; - } -@@ -144,7 +144,7 @@ static /*@null@*/ char *shadowtcb_path_r - if (-1 == ret) { - fprintf (shadow_logfd, - _("%s: Cannot read symbolic link %s: %s\n"), -- Prog, path, strerror (errno)); -+ shadow_progname, path, strerror (errno)); - free (path); - return NULL; - } -@@ -153,7 +153,7 @@ static /*@null@*/ char *shadowtcb_path_r - link[sizeof(link) - 1] = '\0'; - fprintf (shadow_logfd, - _("%s: Suspiciously long symlink: %s\n"), -- Prog, link); -+ shadow_progname, link); - return NULL; - } - link[(size_t)ret] = '\0'; -@@ -211,7 +211,7 @@ static shadowtcb_status mkdir_leading (c - if (stat (TCB_DIR, &st) != 0) { - fprintf (shadow_logfd, - _("%s: Cannot stat %s: %s\n"), -- Prog, TCB_DIR, strerror (errno)); -+ shadow_progname, TCB_DIR, strerror (errno)); - goto out_free_path; - } - while ((ind = strchr (ptr, '/'))) { -@@ -223,19 +223,19 @@ static shadowtcb_status mkdir_leading (c - if ((mkdir (dir, 0700) != 0) && (errno != EEXIST)) { - fprintf (shadow_logfd, - _("%s: Cannot create directory %s: %s\n"), -- Prog, dir, strerror (errno)); -+ shadow_progname, dir, strerror (errno)); - goto out_free_dir; - } - if (chown (dir, 0, st.st_gid) != 0) { - fprintf (shadow_logfd, - _("%s: Cannot change owner of %s: %s\n"), -- Prog, dir, strerror (errno)); -+ shadow_progname, dir, strerror (errno)); - goto out_free_dir; - } - if (chmod (dir, 0711) != 0) { - fprintf (shadow_logfd, - _("%s: Cannot change mode of %s: %s\n"), -- Prog, dir, strerror (errno)); -+ shadow_progname, dir, strerror (errno)); - goto out_free_dir; - } - free (dir); -@@ -265,7 +265,7 @@ static shadowtcb_status unlink_suffs (co - if ((unlink (tmp) != 0) && (errno != ENOENT)) { - fprintf (shadow_logfd, - _("%s: unlink: %s: %s\n"), -- Prog, tmp, strerror (errno)); -+ shadow_progname, tmp, strerror (errno)); - free (tmp); - return SHADOWTCB_FAILURE; - } -@@ -290,7 +290,7 @@ static shadowtcb_status rmdir_leading (c - if (errno != ENOTEMPTY) { - fprintf (shadow_logfd, - _("%s: Cannot remove directory %s: %s\n"), -- Prog, dir, strerror (errno)); -+ shadow_progname, dir, strerror (errno)); - ret = SHADOWTCB_FAILURE; - } - free (dir); -@@ -319,7 +319,7 @@ static shadowtcb_status move_dir (const - if (stat (olddir, &oldmode) != 0) { - fprintf (shadow_logfd, - _("%s: Cannot stat %s: %s\n"), -- Prog, olddir, strerror (errno)); -+ shadow_progname, olddir, strerror (errno)); - goto out_free; - } - old_uid = oldmode.st_uid; -@@ -346,7 +346,7 @@ static shadowtcb_status move_dir (const - if (rename (real_old_dir, real_new_dir) != 0) { - fprintf (shadow_logfd, - _("%s: Cannot rename %s to %s: %s\n"), -- Prog, real_old_dir, real_new_dir, strerror (errno)); -+ shadow_progname, real_old_dir, real_new_dir, strerror (errno)); - goto out_free; - } - if (rmdir_leading (real_old_dir_rel) == SHADOWTCB_FAILURE) { -@@ -355,7 +355,7 @@ static shadowtcb_status move_dir (const - if ((unlink (olddir) != 0) && (errno != ENOENT)) { - fprintf (shadow_logfd, - _("%s: Cannot remove %s: %s\n"), -- Prog, olddir, strerror (errno)); -+ shadow_progname, olddir, strerror (errno)); - goto out_free; - } - if (asprintf (&newdir, TCB_DIR "/%s", user_newname) == -1) { -@@ -369,7 +369,7 @@ static shadowtcb_status move_dir (const - && (symlink (real_new_dir_rel, newdir) != 0)) { - fprintf (shadow_logfd, - _("%s: Cannot create symbolic link %s: %s\n"), -- Prog, real_new_dir_rel, strerror (errno)); -+ shadow_progname, real_new_dir_rel, strerror (errno)); - goto out_free; - } - ret = SHADOWTCB_SUCCESS; -@@ -468,31 +468,31 @@ shadowtcb_status shadowtcb_move (/*@NULL - if (stat (tcbdir, &dirmode) != 0) { - fprintf (shadow_logfd, - _("%s: Cannot stat %s: %s\n"), -- Prog, tcbdir, strerror (errno)); -+ shadow_progname, tcbdir, strerror (errno)); - goto out_free; - } - if (chown (tcbdir, 0, 0) != 0) { - fprintf (shadow_logfd, - _("%s: Cannot change owners of %s: %s\n"), -- Prog, tcbdir, strerror (errno)); -+ shadow_progname, tcbdir, strerror (errno)); - goto out_free; - } - if (chmod (tcbdir, 0700) != 0) { - fprintf (shadow_logfd, - _("%s: Cannot change mode of %s: %s\n"), -- Prog, tcbdir, strerror (errno)); -+ shadow_progname, tcbdir, strerror (errno)); - goto out_free; - } - if (lstat (shadow, &filemode) != 0) { - if (errno != ENOENT) { - fprintf (shadow_logfd, - _("%s: Cannot lstat %s: %s\n"), -- Prog, shadow, strerror (errno)); -+ shadow_progname, shadow, strerror (errno)); - goto out_free; - } - fprintf (shadow_logfd, - _("%s: Warning, user %s has no tcb shadow file.\n"), -- Prog, user_newname); -+ shadow_progname, user_newname); - } else { - if (!S_ISREG (filemode.st_mode) || - filemode.st_nlink != 1) { -@@ -500,19 +500,19 @@ shadowtcb_status shadowtcb_move (/*@NULL - _("%s: Emergency: %s's tcb shadow is not a " - "regular file with st_nlink=1.\n" - "The account is left locked.\n"), -- Prog, user_newname); -+ shadow_progname, user_newname); - goto out_free; - } - if (chown (shadow, user_newid, filemode.st_gid) != 0) { - fprintf (shadow_logfd, - _("%s: Cannot change owner of %s: %s\n"), -- Prog, shadow, strerror (errno)); -+ shadow_progname, shadow, strerror (errno)); - goto out_free; - } - if (chmod (shadow, filemode.st_mode & 07777) != 0) { - fprintf (shadow_logfd, - _("%s: Cannot change mode of %s: %s\n"), -- Prog, shadow, strerror (errno)); -+ shadow_progname, shadow, strerror (errno)); - goto out_free; - } - } -@@ -522,7 +522,7 @@ shadowtcb_status shadowtcb_move (/*@NULL - if (chown (tcbdir, user_newid, dirmode.st_gid) != 0) { - fprintf (shadow_logfd, - _("%s: Cannot change owner of %s: %s\n"), -- Prog, tcbdir, strerror (errno)); -+ shadow_progname, tcbdir, strerror (errno)); - goto out_free; - } - ret = SHADOWTCB_SUCCESS; -@@ -547,7 +547,7 @@ shadowtcb_status shadowtcb_create (const - if (stat (TCB_DIR, &tcbdir_stat) != 0) { - fprintf (shadow_logfd, - _("%s: Cannot stat %s: %s\n"), -- Prog, TCB_DIR, strerror (errno)); -+ shadow_progname, TCB_DIR, strerror (errno)); - return SHADOWTCB_FAILURE; - } - shadowgid = tcbdir_stat.st_gid; -@@ -567,39 +567,39 @@ shadowtcb_status shadowtcb_create (const - if (mkdir (dir, 0700) != 0) { - fprintf (shadow_logfd, - _("%s: mkdir: %s: %s\n"), -- Prog, dir, strerror (errno)); -+ shadow_progname, dir, strerror (errno)); - goto out_free; - } - fd = open (shadow, O_RDWR | O_CREAT | O_TRUNC, 0600); - if (fd < 0) { - fprintf (shadow_logfd, - _("%s: Cannot open %s: %s\n"), -- Prog, shadow, strerror (errno)); -+ shadow_progname, shadow, strerror (errno)); - goto out_free; - } - close (fd); - if (chown (shadow, 0, authgid) != 0) { - fprintf (shadow_logfd, - _("%s: Cannot change owner of %s: %s\n"), -- Prog, shadow, strerror (errno)); -+ shadow_progname, shadow, strerror (errno)); - goto out_free; - } - if (chmod (shadow, (mode_t) ((authgid == shadowgid) ? 0600 : 0640)) != 0) { - fprintf (shadow_logfd, - _("%s: Cannot change mode of %s: %s\n"), -- Prog, shadow, strerror (errno)); -+ shadow_progname, shadow, strerror (errno)); - goto out_free; - } - if (chown (dir, 0, authgid) != 0) { - fprintf (shadow_logfd, - _("%s: Cannot change owner of %s: %s\n"), -- Prog, dir, strerror (errno)); -+ shadow_progname, dir, strerror (errno)); - goto out_free; - } - if (chmod (dir, (mode_t) ((authgid == shadowgid) ? 02700 : 02710)) != 0) { - fprintf (shadow_logfd, - _("%s: Cannot change mode of %s: %s\n"), -- Prog, dir, strerror (errno)); -+ shadow_progname, dir, strerror (errno)); - goto out_free; - } - if ( (shadowtcb_set_user (name) == SHADOWTCB_FAILURE) diff --git a/shadow-4.9-revert-useradd-fix-memleak.patch b/shadow-4.9-revert-useradd-fix-memleak.patch deleted file mode 100644 index e8251f2..0000000 --- a/shadow-4.9-revert-useradd-fix-memleak.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4624e9fca1b02b64e25e8b2280a0186182ab73ba Mon Sep 17 00:00:00 2001 -From: Serge Hallyn -Date: Sat, 14 Aug 2021 19:37:24 -0500 -Subject: [PATCH] Revert "useradd.c:fix memleaks of grp" - -In some cases, the value which was being freed is not actually -safe to free. - -Closes #394 - -This reverts commit c44b71cec25d60efc51aec9de3abce1f6efbfcf5. ---- - src/useradd.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/useradd.c b/src/useradd.c -index f90127cd..0d3f390d 100644 ---- a/src/useradd.c -+++ b/src/useradd.c -@@ -413,7 +413,6 @@ static void get_defaults (void) - } else { - def_group = grp->gr_gid; - def_gname = xstrdup (grp->gr_name); -- gr_free(grp); - } - } - --- -2.31.1 - diff --git a/shadow-4.9-semanage-close-the-selabel-handle.patch b/shadow-4.9-semanage-close-the-selabel-handle.patch deleted file mode 100644 index 11a23e4..0000000 --- a/shadow-4.9-semanage-close-the-selabel-handle.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 234af5cf67fc1a3ba99fc246ba65869a3c416545 Mon Sep 17 00:00:00 2001 -From: Iker Pedrosa -Date: Fri, 8 Oct 2021 13:13:13 +0200 -Subject: [PATCH] semanage: close the selabel handle - -Close the selabel handle to update the file_context. This means that the -file_context will be remmaped and used by selabel_lookup() to return -the appropriate context to label the home folder. - -Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1993081 - -Signed-off-by: Iker Pedrosa ---- - lib/prototypes.h | 1 + - lib/selinux.c | 5 +++++ - lib/semanage.c | 1 + - 3 files changed, 7 insertions(+) - -diff --git a/lib/prototypes.h b/lib/prototypes.h -index 1d1586d4..b697e0ec 100644 ---- a/lib/prototypes.h -+++ b/lib/prototypes.h -@@ -392,6 +392,7 @@ extern /*@observer@*/const char *crypt_make_salt (/*@null@*//*@observer@*/const - /* selinux.c */ - #ifdef WITH_SELINUX - extern int set_selinux_file_context (const char *dst_name, mode_t mode); -+extern void reset_selinux_handle (void); - extern int reset_selinux_file_context (void); - extern int check_selinux_permit (const char *perm_name); - #endif -diff --git a/lib/selinux.c b/lib/selinux.c -index c83545f9..b075d4c0 100644 ---- a/lib/selinux.c -+++ b/lib/selinux.c -@@ -50,6 +50,11 @@ static void cleanup(void) - } - } - -+void reset_selinux_handle (void) -+{ -+ cleanup(); -+} -+ - /* - * set_selinux_file_context - Set the security context before any file or - * directory creation. -diff --git a/lib/semanage.c b/lib/semanage.c -index 0d30456a..a5bf9218 100644 ---- a/lib/semanage.c -+++ b/lib/semanage.c -@@ -293,6 +293,7 @@ int set_seuser (const char *login_name, const char *seuser_name) - } - - ret = 0; -+ reset_selinux_handle(); - - done: - semanage_seuser_key_free (key); --- -2.31.1 - diff --git a/shadow-4.9-shadow-progname-default-init.patch b/shadow-4.9-shadow-progname-default-init.patch deleted file mode 100644 index 0c6d616..0000000 --- a/shadow-4.9-shadow-progname-default-init.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -up shadow-4.9/lib/shadowlog.c.debug3 shadow-4.9/lib/shadowlog.c ---- shadow-4.9/lib/shadowlog.c.debug3 2022-01-10 11:16:31.636261531 +0100 -+++ shadow-4.9/lib/shadowlog.c 2022-01-10 11:16:31.637261538 +0100 -@@ -2,8 +2,8 @@ - - #include "lib/shadowlog_internal.h" - --const char *shadow_progname; --FILE *shadow_logfd; -+const char *shadow_progname = "libshadow"; -+FILE *shadow_logfd = NULL; - - void log_set_progname(const char *progname) - { -diff -up shadow-4.9/libsubid/api.c.debug3 shadow-4.9/libsubid/api.c ---- shadow-4.9/libsubid/api.c.debug3 2022-01-10 11:16:31.637261538 +0100 -+++ shadow-4.9/libsubid/api.c 2022-01-10 11:17:15.431574120 +0100 -@@ -40,17 +40,16 @@ - #include "subid.h" - #include "shadowlog.h" - --const char *Prog = "(libsubid)"; -- - bool libsubid_init(const char *progname, FILE * logfd) - { - FILE *shadow_logfd; - if (progname) { - progname = strdup(progname); -- if (progname) -- Prog = progname; -- else -+ if (!progname) - return false; -+ log_set_progname(progname); -+ } else { -+ log_set_progname("(libsubid)"); - } - - if (logfd) { diff --git a/shadow-4.9-useradd-avoid-generating-empty-subid-range.patch b/shadow-4.9-useradd-avoid-generating-empty-subid-range.patch deleted file mode 100644 index b94fd60..0000000 --- a/shadow-4.9-useradd-avoid-generating-empty-subid-range.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/src/useradd.c b/src/useradd.c -index baeffb35..9abeea6e 100644 ---- a/src/useradd.c -+++ b/src/useradd.c -@@ -142,9 +142,7 @@ static bool is_sub_gid = false; - static bool sub_uid_locked = false; - static bool sub_gid_locked = false; - static uid_t sub_uid_start; /* New subordinate uid range */ --static unsigned long sub_uid_count; - static gid_t sub_gid_start; /* New subordinate gid range */ --static unsigned long sub_gid_count; - #endif /* ENABLE_SUBIDS */ - static bool pw_locked = false; - static bool gr_locked = false; -@@ -234,7 +232,7 @@ static void open_shadow (void); - static void faillog_reset (uid_t); - static void lastlog_reset (uid_t); - static void tallylog_reset (const char *); --static void usr_update (void); -+static void usr_update (unsigned long subuid_count, unsigned long subgid_count); - static void create_home (void); - static void create_mail (void); - static void check_uid_range(int rflg, uid_t user_id); -@@ -2092,7 +2090,7 @@ static void tallylog_reset (const char *user_name) - * usr_update() creates the password file entries for this user - * and will update the group entries if required. - */ --static void usr_update (void) -+static void usr_update (unsigned long subuid_count, unsigned long subgid_count) - { - struct passwd pwent; - struct spwd spent; -@@ -2155,14 +2153,14 @@ static void usr_update (void) - } - #ifdef ENABLE_SUBIDS - if (is_sub_uid && -- (sub_uid_add(user_name, sub_uid_start, sub_uid_count) == 0)) { -+ (sub_uid_add(user_name, sub_uid_start, subuid_count) == 0)) { - fprintf (stderr, - _("%s: failed to prepare the new %s entry\n"), - Prog, sub_uid_dbname ()); - fail_exit (E_SUB_UID_UPDATE); - } - if (is_sub_gid && -- (sub_gid_add(user_name, sub_gid_start, sub_gid_count) == 0)) { -+ (sub_gid_add(user_name, sub_gid_start, subgid_count) == 0)) { - fprintf (stderr, - _("%s: failed to prepare the new %s entry\n"), - Prog, sub_uid_dbname ()); -@@ -2624,16 +2622,16 @@ int main (int argc, char **argv) - } - - #ifdef ENABLE_SUBIDS -- if (is_sub_uid && sub_uid_count != 0) { -- if (find_new_sub_uids(&sub_uid_start, &sub_uid_count) < 0) { -+ if (is_sub_uid && subuid_count != 0) { -+ if (find_new_sub_uids(&sub_uid_start, &subuid_count) < 0) { - fprintf (stderr, - _("%s: can't create subordinate user IDs\n"), - Prog); - fail_exit(E_SUB_UID_UPDATE); - } - } -- if (is_sub_gid && sub_gid_count != 0) { -- if (find_new_sub_gids(&sub_gid_start, &sub_gid_count) < 0) { -+ if (is_sub_gid && subgid_count != 0) { -+ if (find_new_sub_gids(&sub_gid_start, &subgid_count) < 0) { - fprintf (stderr, - _("%s: can't create subordinate group IDs\n"), - Prog); -@@ -2642,7 +2640,7 @@ int main (int argc, char **argv) - } - #endif /* ENABLE_SUBIDS */ - -- usr_update (); -+ usr_update (subuid_count, subgid_count); - - close_files (); - diff --git a/shadow-4.9-useradd-copy-tree-argument.patch b/shadow-4.9-useradd-copy-tree-argument.patch deleted file mode 100644 index f6b9827..0000000 --- a/shadow-4.9-useradd-copy-tree-argument.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/useradd.c b/src/useradd.c -index b463a170..f7c97958 100644 ---- a/src/useradd.c -+++ b/src/useradd.c -@@ -2704,7 +2704,7 @@ int main (int argc, char **argv) - if (mflg) { - create_home (); - if (home_added) { -- copy_tree (def_template, prefix_user_home, false, false, -+ copy_tree (def_template, prefix_user_home, false, true, - (uid_t)-1, user_id, (gid_t)-1, user_gid); - } else { - fprintf (stderr, diff --git a/shadow-4.9-useradd-modify-check-ID-range-for-system-users.patch b/shadow-4.9-useradd-modify-check-ID-range-for-system-users.patch deleted file mode 100644 index e000d37..0000000 --- a/shadow-4.9-useradd-modify-check-ID-range-for-system-users.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up shadow-4.9/src/useradd.c.useradd-modify-check-ID-range-for-system-users shadow-4.9/src/useradd.c ---- shadow-4.9/src/useradd.c.useradd-modify-check-ID-range-for-system-users 2022-08-22 12:50:34.359702764 +0200 -+++ shadow-4.9/src/useradd.c 2022-08-22 12:54:25.144463425 +0200 -@@ -2319,12 +2319,10 @@ static void check_uid_range(int rflg, ui - { - uid_t uid_min ; - uid_t uid_max ; -- if(rflg){ -- uid_min = (uid_t)getdef_ulong("SYS_UID_MIN",101UL); -+ if (rflg) { - uid_max = (uid_t)getdef_ulong("SYS_UID_MAX",getdef_ulong("UID_MIN",1000UL)-1); -- if(uid_min <= uid_max){ -- if(user_id < uid_min || user_id >uid_max) -- fprintf(stderr, _("%s warning: %s's uid %d outside of the SYS_UID_MIN %d and SYS_UID_MAX %d range.\n"), Prog, user_name, user_id, uid_min, uid_max); -+ if (user_id > uid_max) { -+ fprintf(stderr, _("%s warning: %s's uid %d is greater than SYS_UID_MAX %d\n"), Prog, user_name, user_id, uid_max); - } - }else{ - uid_min = (uid_t)getdef_ulong("UID_MIN", 1000UL); diff --git a/shadow-4.9-useradd-stop-last-fail-log-reset.patch b/shadow-4.9-useradd-stop-last-fail-log-reset.patch deleted file mode 100644 index 8662672..0000000 --- a/shadow-4.9-useradd-stop-last-fail-log-reset.patch +++ /dev/null @@ -1,42 +0,0 @@ -From ebf9b232b012725d2be5e750876c7336cf1c37fd Mon Sep 17 00:00:00 2001 -From: David Kalnischkies -Date: Wed, 24 Aug 2022 13:21:01 +0200 -Subject: [PATCH] useradd: Do not reset non-existent data in {last,fail}log - -useradd does not create the files if they don't exist, but if they exist -it will reset user data even if the data did not exist before creating -a hole and an explicitly zero'd data point resulting (especially for -high UIDs) in a lot of zeros ending up in containers and tarballs. ---- - src/useradd.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/useradd.c b/src/useradd.c -index 6eaeb533..39a744ee 100644 ---- a/src/useradd.c -+++ b/src/useradd.c -@@ -1996,8 +1996,9 @@ static void faillog_reset (uid_t uid) - struct faillog fl; - int fd; - off_t offset_uid = (off_t) (sizeof fl) * uid; -+ struct stat st; - -- if (access (FAILLOG_FILE, F_OK) != 0) { -+ if (stat (FAILLOG_FILE, &st) != 0 || st.st_size <= offset_uid) { - return; - } - -@@ -2033,8 +2034,9 @@ static void lastlog_reset (uid_t uid) - int fd; - off_t offset_uid = (off_t) (sizeof ll) * uid; - uid_t max_uid; -+ struct stat st; - -- if (access (LASTLOG_FILE, F_OK) != 0) { -+ if (stat (LASTLOG_FILE, &st) != 0 || st.st_size <= offset_uid) { - return; - } - --- -2.37.3 - diff --git a/shadow-4.9-usermod-allow-all-group-types.patch b/shadow-4.9-usermod-allow-all-group-types.patch deleted file mode 100644 index fada15e..0000000 --- a/shadow-4.9-usermod-allow-all-group-types.patch +++ /dev/null @@ -1,322 +0,0 @@ -From e481437ab9ebe9a8bf8fbaabe986d42b2f765991 Mon Sep 17 00:00:00 2001 -From: Iker Pedrosa -Date: Tue, 3 Aug 2021 08:57:20 +0200 -Subject: [PATCH] usermod: allow all group types with -G option - -The only way of removing a group from the supplementary list is to use --G option, and list all groups that the user is a member of except for -the one that wants to be removed. The problem lies when there's a user -that contains both local and remote groups, and the group to be removed -is a local one. As we need to include the remote group with -G option -the command will fail. - -This reverts commit 140510de9de4771feb3af1d859c09604043a4c9b. This way, -it would be possible to remove the remote groups from the supplementary -list. - -Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1967641 -Resolves: https://github.com/shadow-maint/shadow/issues/338 - -Signed-off-by: Iker Pedrosa ---- - src/usermod.c | 220 ++++++++++++++++++-------------------------------- - 1 file changed, 77 insertions(+), 143 deletions(-) - -diff --git a/src/usermod.c b/src/usermod.c -index 03bb9b9d..a0c03afa 100644 ---- a/src/usermod.c -+++ b/src/usermod.c -@@ -187,7 +187,6 @@ static bool sub_gid_locked = false; - static void date_to_str (/*@unique@*//*@out@*/char *buf, size_t maxsize, - long int date); - static int get_groups (char *); --static struct group * get_local_group (char * grp_name); - static /*@noreturn@*/void usage (int status); - static void new_pwent (struct passwd *); - static void new_spent (struct spwd *); -@@ -201,9 +200,7 @@ static void grp_update (void); - - static void process_flags (int, char **); - static void close_files (void); --static void close_group_files (void); - static void open_files (void); --static void open_group_files (void); - static void usr_update (void); - static void move_home (void); - static void update_lastlog (void); -@@ -260,11 +257,6 @@ static int get_groups (char *list) - return 0; - } - -- /* -- * Open the group files -- */ -- open_group_files (); -- - /* - * So long as there is some data to be converted, strip off each - * name and look it up. A mix of numerical and string values for -@@ -284,7 +276,7 @@ static int get_groups (char *list) - * Names starting with digits are treated as numerical GID - * values, otherwise the string is looked up as is. - */ -- grp = get_local_group (list); -+ grp = prefix_getgr_nam_gid (list); - - /* - * There must be a match, either by GID value or by -@@ -334,8 +326,6 @@ static int get_groups (char *list) - gr_free ((struct group *)grp); - } while (NULL != list); - -- close_group_files (); -- - user_groups[ngroups] = (char *) 0; - - /* -@@ -348,44 +338,6 @@ static int get_groups (char *list) - return 0; - } - --/* -- * get_local_group - checks if a given group name exists locally -- * -- * get_local_group() checks if a given group name exists locally. -- * If the name exists the group information is returned, otherwise NULL is -- * returned. -- */ --static struct group * get_local_group(char * grp_name) --{ -- const struct group *grp; -- struct group *result_grp = NULL; -- long long int gid; -- char *endptr; -- -- gid = strtoll (grp_name, &endptr, 10); -- if ( ('\0' != *grp_name) -- && ('\0' == *endptr) -- && (ERANGE != errno) -- && (gid == (gid_t)gid)) { -- grp = gr_locate_gid ((gid_t) gid); -- } -- else { -- grp = gr_locate(grp_name); -- } -- -- if (grp != NULL) { -- result_grp = __gr_dup (grp); -- if (NULL == result_grp) { -- fprintf (stderr, -- _("%s: Out of memory. Cannot find group '%s'.\n"), -- Prog, grp_name); -- fail_exit (E_GRP_UPDATE); -- } -- } -- -- return result_grp; --} -- - #ifdef ENABLE_SUBIDS - struct ulong_range - { -@@ -1523,7 +1475,50 @@ static void close_files (void) - } - - if (Gflg || lflg) { -- close_group_files (); -+ if (gr_close () == 0) { -+ fprintf (stderr, -+ _("%s: failure while writing changes to %s\n"), -+ Prog, gr_dbname ()); -+ SYSLOG ((LOG_ERR, -+ "failure while writing changes to %s", -+ gr_dbname ())); -+ fail_exit (E_GRP_UPDATE); -+ } -+#ifdef SHADOWGRP -+ if (is_shadow_grp) { -+ if (sgr_close () == 0) { -+ fprintf (stderr, -+ _("%s: failure while writing changes to %s\n"), -+ Prog, sgr_dbname ()); -+ SYSLOG ((LOG_ERR, -+ "failure while writing changes to %s", -+ sgr_dbname ())); -+ fail_exit (E_GRP_UPDATE); -+ } -+ } -+#endif -+#ifdef SHADOWGRP -+ if (is_shadow_grp) { -+ if (sgr_unlock () == 0) { -+ fprintf (stderr, -+ _("%s: failed to unlock %s\n"), -+ Prog, sgr_dbname ()); -+ SYSLOG ((LOG_ERR, -+ "failed to unlock %s", -+ sgr_dbname ())); -+ /* continue */ -+ } -+ } -+#endif -+ if (gr_unlock () == 0) { -+ fprintf (stderr, -+ _("%s: failed to unlock %s\n"), -+ Prog, gr_dbname ()); -+ SYSLOG ((LOG_ERR, -+ "failed to unlock %s", -+ gr_dbname ())); -+ /* continue */ -+ } - } - - if (is_shadow_pwd) { -@@ -1592,60 +1587,6 @@ static void close_files (void) - #endif - } - --/* -- * close_group_files - close all of the files that were opened -- * -- * close_group_files() closes all of the files that were opened related -- * with groups. This causes any modified entries to be written out. -- */ --static void close_group_files (void) --{ -- if (gr_close () == 0) { -- fprintf (stderr, -- _("%s: failure while writing changes to %s\n"), -- Prog, gr_dbname ()); -- SYSLOG ((LOG_ERR, -- "failure while writing changes to %s", -- gr_dbname ())); -- fail_exit (E_GRP_UPDATE); -- } --#ifdef SHADOWGRP -- if (is_shadow_grp) { -- if (sgr_close () == 0) { -- fprintf (stderr, -- _("%s: failure while writing changes to %s\n"), -- Prog, sgr_dbname ()); -- SYSLOG ((LOG_ERR, -- "failure while writing changes to %s", -- sgr_dbname ())); -- fail_exit (E_GRP_UPDATE); -- } -- } --#endif --#ifdef SHADOWGRP -- if (is_shadow_grp) { -- if (sgr_unlock () == 0) { -- fprintf (stderr, -- _("%s: failed to unlock %s\n"), -- Prog, sgr_dbname ()); -- SYSLOG ((LOG_ERR, -- "failed to unlock %s", -- sgr_dbname ())); -- /* continue */ -- } -- } --#endif -- if (gr_unlock () == 0) { -- fprintf (stderr, -- _("%s: failed to unlock %s\n"), -- Prog, gr_dbname ()); -- SYSLOG ((LOG_ERR, -- "failed to unlock %s", -- gr_dbname ())); -- /* continue */ -- } --} -- - /* - * open_files - lock and open the password files - * -@@ -1681,7 +1622,38 @@ static void open_files (void) - } - - if (Gflg || lflg) { -- open_group_files (); -+ /* -+ * Lock and open the group file. This will load all of the -+ * group entries. -+ */ -+ if (gr_lock () == 0) { -+ fprintf (stderr, -+ _("%s: cannot lock %s; try again later.\n"), -+ Prog, gr_dbname ()); -+ fail_exit (E_GRP_UPDATE); -+ } -+ gr_locked = true; -+ if (gr_open (O_CREAT | O_RDWR) == 0) { -+ fprintf (stderr, -+ _("%s: cannot open %s\n"), -+ Prog, gr_dbname ()); -+ fail_exit (E_GRP_UPDATE); -+ } -+#ifdef SHADOWGRP -+ if (is_shadow_grp && (sgr_lock () == 0)) { -+ fprintf (stderr, -+ _("%s: cannot lock %s; try again later.\n"), -+ Prog, sgr_dbname ()); -+ fail_exit (E_GRP_UPDATE); -+ } -+ sgr_locked = true; -+ if (is_shadow_grp && (sgr_open (O_CREAT | O_RDWR) == 0)) { -+ fprintf (stderr, -+ _("%s: cannot open %s\n"), -+ Prog, sgr_dbname ()); -+ fail_exit (E_GRP_UPDATE); -+ } -+#endif - } - #ifdef ENABLE_SUBIDS - if (vflg || Vflg) { -@@ -1717,44 +1689,6 @@ static void open_files (void) - #endif /* ENABLE_SUBIDS */ - } - --/* -- * open_group_files - lock and open the group files -- * -- * open_group_files() loads all of the group entries. -- */ --static void open_group_files (void) --{ -- if (gr_lock () == 0) { -- fprintf (stderr, -- _("%s: cannot lock %s; try again later.\n"), -- Prog, gr_dbname ()); -- fail_exit (E_GRP_UPDATE); -- } -- gr_locked = true; -- if (gr_open (O_CREAT | O_RDWR) == 0) { -- fprintf (stderr, -- _("%s: cannot open %s\n"), -- Prog, gr_dbname ()); -- fail_exit (E_GRP_UPDATE); -- } -- --#ifdef SHADOWGRP -- if (is_shadow_grp && (sgr_lock () == 0)) { -- fprintf (stderr, -- _("%s: cannot lock %s; try again later.\n"), -- Prog, sgr_dbname ()); -- fail_exit (E_GRP_UPDATE); -- } -- sgr_locked = true; -- if (is_shadow_grp && (sgr_open (O_CREAT | O_RDWR) == 0)) { -- fprintf (stderr, -- _("%s: cannot open %s\n"), -- Prog, sgr_dbname ()); -- fail_exit (E_GRP_UPDATE); -- } --#endif --} -- - /* - * usr_update - create the user entries - * --- -2.31.1 - diff --git a/shadow-utils.login.defs b/shadow-utils.login.defs index 486203b..e84c7ab 100644 --- a/shadow-utils.login.defs +++ b/shadow-utils.login.defs @@ -130,10 +130,9 @@ HOME_MODE 0700 # PASS_MAX_DAYS 99999 PASS_MIN_DAYS 0 +PASS_MIN_LEN 8 PASS_WARN_AGE 7 -# Currently PASS_MIN_LEN is not supported - # Currently SU_WHEEL_ONLY is not supported # Currently CRACKLIB_DICTPATH is not supported @@ -147,7 +146,7 @@ UID_MAX 60000 SYS_UID_MIN 201 SYS_UID_MAX 999 # Extra per user uids -SUB_UID_MIN 100000 +SUB_UID_MIN 524288 SUB_UID_MAX 600100000 SUB_UID_COUNT 65536 @@ -160,7 +159,7 @@ GID_MAX 60000 SYS_GID_MIN 201 SYS_GID_MAX 999 # Extra per user group ids -SUB_GID_MIN 100000 +SUB_GID_MIN 524288 SUB_GID_MAX 600100000 SUB_GID_COUNT 65536 @@ -174,11 +173,22 @@ SUB_GID_COUNT 65536 # #LOGIN_TIMEOUT 60 -# Currently PASS_CHANGE_TRIES is not supported +# +# Maximum number of attempts to change password if rejected (too easy) +# +PASS_CHANGE_TRIES 5 -# Currently PASS_ALWAYS_WARN is not supported +# +# Warn about weak passwords (but still allow them) if you are root. +# +PASS_ALWAYS_WARN yes -# Currently PASS_MAX_LEN is not supported +# +# Number of significant characters in the password for crypt(). +# Default is 8, don't change unless your crypt() is better. +# Ignored if MD5_CRYPT_ENAB set to "yes". +# +#PASS_MAX_LEN 8 # Currently CHFN_AUTH is not supported @@ -293,3 +303,13 @@ CREATE_HOME yes # missing. # #FORCE_SHADOW yes + +# +# Select the HMAC cryptography algorithm. +# Used in pam_timestamp module to calculate the keyed-hash message +# authentication code. +# +# Note: It is recommended to check hmac(3) to see the possible algorithms +# that are available in your system. +# +HMAC_CRYPTO_ALGO SHA512 diff --git a/shadow-utils.spec b/shadow-utils.spec index 28638ee..7bc7e8b 100644 --- a/shadow-utils.spec +++ b/shadow-utils.spec @@ -1,91 +1,30 @@ Summary: Utilities for managing accounts and shadow password files Name: shadow-utils -Version: 4.9 -Release: 12%{?dist} +Version: 4.20.0 +Release: 1%{?dist} Epoch: 2 -License: BSD and GPLv2+ +License: BSD-3-Clause AND GPL-2.0-or-later URL: https://github.com/shadow-maint/shadow -Source0: https://github.com/shadow-maint/shadow/releases/download/%{version}/shadow-%{version}.tar.xz -Source1: https://github.com/shadow-maint/shadow/releases/download/%{version}/shadow-%{version}.tar.xz.asc +Source0: https://github.com/shadow-maint/shadow/releases/download/4.20.0/shadow-4.20.0.tar.xz +Source1: https://github.com/shadow-maint/shadow/releases/download/4.20.0/shadow-4.20.0.tar.xz.asc Source2: shadow-utils.useradd Source3: shadow-utils.login.defs Source4: shadow-bsd.txt Source5: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt Source6: shadow-utils.HOME_MODE.xml +Source7: passwd.pamd ### Globals ### %global includesubiddir %{_includedir}/shadow +# Fail linking if there are undefined symbols. +%global _ld_strict_symbol_defs 1 ### Patches ### -# Misc small changes - most probably non-upstreamable -Patch0: shadow-4.9-redhat.patch -# Be more lenient with acceptable user/group names - non upstreamable -Patch1: shadow-4.8-goodname.patch -# https://github.com/shadow-maint/shadow/commit/09c752f00f9dfc610f66d68be38c9e5be8ca7f15 -Patch2: shadow-4.9-move-create-home.patch -# SElinux related - upstreamability unknown -Patch3: shadow-4.9-default-range.patch -# Misc manual page changes - non-upstreamable -Patch4: shadow-4.9-manfix.patch -# Date parsing improvement - could be upstreamed -Patch5: shadow-4.2.1-date-parsing.patch -# Additional error message - could be upstreamed -Patch6: shadow-4.6-move-home.patch -# Audit message changes - upstreamability unknown -Patch7: shadow-4.9-audit-update.patch -# Changes related to password unlocking - could be upstreamed -Patch8: shadow-4.5-usermod-unlock.patch -# Additional SElinux related changes - upstreamability unknown -Patch9: shadow-4.8-selinux-perms.patch -# Handle NULL return from *time funcs - could be upstreamed -Patch10: shadow-4.9-null-tm.patch -# Handle /etc/passwd corruption - could be upstreamed -Patch11: shadow-4.8-long-entry.patch -# Limit uid/gid allocation to non-zero - could be upstreamed -Patch12: shadow-4.6-sysugid-min-limit.patch -# Ignore LOGIN_PLAIN_PROMPT in login.defs - upstreamability unknown -Patch13: shadow-4.8-ignore-login-prompt.patch -# https://github.com/shadow-maint/shadow/commit/c6847011e8b656adacd9a0d2a78418cad0de34cb -Patch14: shadow-4.9-newuidmap-libeconf-dependency.patch -# https://github.com/shadow-maint/shadow/commit/e481437ab9ebe9a8bf8fbaabe986d42b2f765991 -Patch15: shadow-4.9-usermod-allow-all-group-types.patch -# https://github.com/shadow-maint/shadow/commit/9dd720a28578eef5be8171697aae0906e4c53249 -Patch16: shadow-4.9-useradd-avoid-generating-empty-subid-range.patch -# https://github.com/shadow-maint/shadow/commit/234e8fa7b134d1ebabfdad980a3ae5b63c046c62 -Patch17: shadow-4.9-libmisc-fix-default-value-in-SHA_get_salt_rounds.patch -# https://github.com/shadow-maint/shadow/commit/234af5cf67fc1a3ba99fc246ba65869a3c416545 -Patch18: shadow-4.9-semanage-close-the-selabel-handle.patch -# https://github.com/shadow-maint/shadow/commit/4624e9fca1b02b64e25e8b2280a0186182ab73ba -Patch19: shadow-4.9-revert-useradd-fix-memleak.patch -# https://github.com/shadow-maint/shadow/commit/06eb4e4d76ac7f1ac86e68a89b2dc9be7c7323a2 -Patch20: shadow-4.9-useradd-copy-tree-argument.patch -# https://github.com/shadow-maint/shadow/commit/d8e54618feea201987c1f3cb402ed50d1d8b604f -Patch21: shadow-4.9-pwck-fix-segfault-when-calling-fprintf.patch -# https://github.com/shadow-maint/shadow/commit/497e90751bc0d95cc998b0f06305040563903948 -Patch22: shadow-4.9-newgrp-fix-segmentation-fault.patch -# https://github.com/shadow-maint/shadow/commit/3b6ccf642c6bb2b7db087f09ee563ae9318af734 -Patch23: shadow-4.9-getsubids.patch -# https://github.com/shadow-maint/shadow/commit/a757b458ffb4fb9a40bcbb4f7869449431c67f83 -Patch24: shadow-4.9-groupdel-fix-sigsegv-when-passwd-does-not-exist.patch -# https://github.com/shadow-maint/shadow/commit/79157cbad87f42cdc2068d72e798488572c68bb2 -Patch25: shadow-4.9-make-shadow-logfd-and-prog-not-extern.patch -# https://github.com/shadow-maint/shadow/commit/0e6fe5e728a45baff3977d73e81a27adb6ae30c6 -Patch26: shadow-4.9-rename-prog-to-shadow-progname.patch -# https://github.com/shadow-maint/shadow/commit/2b0bdef6f9a18382e92b0fb6d893c4339123ffac -# https://github.com/shadow-maint/shadow/commit/9750fd681919ed558a9b044248a284d567cddf1a -Patch27: shadow-4.9-shadow-progname-default-init.patch -# https://github.com/shadow-maint/shadow/commit/e101219ad71de11da3fdd1b3ec2620fd1a97b92c -Patch28: shadow-4.9-nss-get-shadow-logfd-with-log-get-logfd.patch -# https://github.com/shadow-maint/shadow/commit/f1f1678e13aa3ae49bdb139efaa2c5bc53dcfe92 -Patch29: shadow-4.9-useradd-modify-check-ID-range-for-system-users.patch -# https://github.com/shadow-maint/shadow/commit/3ec32f9975f262073f8fbdecd2bfaee4a1d3db48 -Patch30: shadow-4.11.1-subordinateio-also-compare-the-owner-ID.patch -# https://github.com/shadow-maint/shadow/commit/ebf9b232b012725d2be5e750876c7336cf1c37fd -Patch31: shadow-4.9-useradd-stop-last-fail-log-reset.patch ### Dependencies ### Requires: audit-libs >= 1.6.5 Requires: libselinux >= 1.25.2-1 +Requires: pam-libs Requires: setup ### Build Dependencies ### @@ -98,17 +37,38 @@ BuildRequires: docbook-style-xsl BuildRequires: flex BuildRequires: gcc BuildRequires: gettext-devel +BuildRequires: git BuildRequires: itstool BuildRequires: libacl-devel BuildRequires: libattr-devel +BuildRequires: libcmocka-devel +BuildRequires: libeconf-devel BuildRequires: libselinux-devel >= 1.25.2-1 BuildRequires: libsemanage-devel BuildRequires: libtool +BuildRequires: libxcrypt-devel BuildRequires: libxslt BuildRequires: make +BuildRequires: pam +BuildRequires: pam-devel ### Provides ### Provides: shadow = %{epoch}:%{version}-%{release} +Provides: passwd = 0.80-18 +Obsoletes: passwd <= 0.80-19 + +%if "%{_sbindir}" == "%{_bindir}" +# Compat symlinks for Requires in other packages. +# We rely on filesystem to create the symlinks for us. +Requires: filesystem(unmerged-sbin-symlinks) +Provides: /usr/sbin/adduser +Provides: /usr/sbin/useradd +Provides: /usr/sbin/userdel +Provides: /usr/sbin/usermod +Provides: /usr/sbin/groupadd +Provides: /usr/sbin/groupdel +Provides: /usr/sbin/groupmod +%endif %description The shadow-utils package includes the necessary programs for @@ -117,16 +77,14 @@ programs for managing user and group accounts. The pwconv command converts passwords to the shadow password format. The pwunconv command unconverts shadow passwords and generates a passwd file (a standard UNIX password file). The pwck command checks the integrity of password -and shadow files. The lastlog command prints out the last login times -for all users. The useradd, userdel, and usermod commands are used for -managing user accounts. The groupadd, groupdel, and groupmod commands -are used for managing group accounts. +and shadow files. The useradd, userdel, and usermod commands are used +for managing user accounts. The groupadd, groupdel, and groupmod +commands are used for managing group accounts. ### Subpackages ### %package subid Summary: A library to manage subordinate uid and gid ranges -License: BSD and GPLv2+ %description subid Utility library that provides a way to manage subid ranges. @@ -134,45 +92,13 @@ Utility library that provides a way to manage subid ranges. %package subid-devel Summary: Development package for shadow-utils-subid -License: BSD and GPLv2+ +Requires: shadow-utils-subid = %{epoch}:%{version}-%{release} %description subid-devel Development files for shadow-utils-subid. %prep -%setup -q -n shadow-%{version} -%patch0 -p1 -b .redhat -%patch1 -p1 -b .goodname -%patch2 -p1 -b .move-create-home -%patch3 -p1 -b .default-range -%patch4 -p1 -b .manfix -%patch5 -p1 -b .date-parsing -%patch6 -p1 -b .move-home -%patch7 -p1 -b .audit-update -%patch8 -p1 -b .unlock -%patch9 -p1 -b .selinux-perms -%patch10 -p1 -b .null-tm -%patch11 -p1 -b .long-entry -%patch12 -p1 -b .sysugid-min-limit -%patch13 -p1 -b .login-prompt -%patch14 -p1 -b .newuidmap-libeconf-dependency -%patch15 -p1 -b .usermod-allow-all-group-types -%patch16 -p1 -b .useradd-avoid-generating-empty-subid-range -%patch17 -p1 -b .libmisc-fix-default-value-in-SHA_get_salt_rounds -%patch18 -p1 -b .semanage-close-the-selabel-handle -%patch19 -p1 -b .revert-useradd-fix-memleak -%patch20 -p1 -b .useradd-copy-tree-argument -%patch21 -p1 -b .pwck-fix-segfault-when-calling-fprintf -%patch22 -p1 -b .newgrp-fix-segmentation-fault -%patch23 -p1 -b .getsubids -%patch24 -p1 -b .groupdel-fix-sigsegv-when-passwd-does-not-exist -%patch25 -p1 -b .make-shadow-logfd-and-prog-not-extern -%patch26 -p1 -b .rename-prog-to-shadow-progname -%patch27 -p1 -b .shadow-progname-default-init -%patch28 -p1 -b .nss-get-shadow-logfd-with-log-get-logfd -%patch29 -p1 -b .useradd-modify-check-ID-range-for-system-users -%patch30 -p1 -b .subordinateio-also-compare-the-owner-ID -%patch31 -p1 -b .useradd-stop-last-fail-log-reset +%autosetup -p 1 -S git -n shadow-4.20.0 iconv -f ISO88591 -t utf-8 doc/HOWTO > doc/HOWTO.utf8 cp -f doc/HOWTO.utf8 doc/HOWTO @@ -180,39 +106,39 @@ cp -f doc/HOWTO.utf8 doc/HOWTO cp -a %{SOURCE4} %{SOURCE5} . cp -a %{SOURCE6} man/login.defs.d/HOME_MODE.xml -# Force regeneration of getdate.c -rm libmisc/getdate.c - %build -%ifarch sparc64 -#sparc64 need big PIE -export CFLAGS="$RPM_OPT_FLAGS -fPIE" -export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" -%else -export CFLAGS="$RPM_OPT_FLAGS -fpie" -export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" -%endif - autoreconf %configure \ - --enable-shadowgrp \ + --disable-account-tools-setuid \ + --enable-logind=no \ --enable-man \ - --with-audit \ - --with-sha-crypt \ - --with-bcrypt \ - --with-yescrypt \ - --with-selinux \ - --without-libcrack \ - --without-libpam \ + --enable-shadowgrp \ --enable-shared \ - --with-group-name-max-length=32 + --with-audit \ + --with-bcrypt \ + --with-group-name-max-length=32 \ + --with-libpam \ + --with-selinux \ + --with-sha-crypt \ + --with-yescrypt \ + --without-libbsd \ + --without-libcrack \ + --without-nscd \ + --without-sssd %make_build +%check +make check + %install %make_install gnulocaledir=$RPM_BUILD_ROOT%{_datadir}/locale MKINSTALLDIRS=`pwd`/mkinstalldirs install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/default install -p -c -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/login.defs install -p -c -m 0600 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/default/useradd +install -d -m 755 $RPM_BUILD_ROOT%{_pam_confdir} +install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_pam_confdir}/chpasswd +install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_pam_confdir}/newusers +install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_pam_confdir}/passwd ln -s useradd $RPM_BUILD_ROOT%{_sbindir}/adduser @@ -221,45 +147,28 @@ for subdir in $RPM_BUILD_ROOT%{_mandir}/{??,??_??,??_??.*}/man* ; do test -d $subdir && test -e $subdir/useradd.8 && echo ".so man8/useradd.8" > $subdir/adduser.8 done +%if "%{_sbindir}" == "%{_bindir}" +# The installation script doesn't actually use the configured paths :( +mv -v $RPM_BUILD_ROOT/usr/sbin/* $RPM_BUILD_ROOT%{_bindir}/ +%endif + # Remove binaries we don't use. rm $RPM_BUILD_ROOT%{_bindir}/chfn rm $RPM_BUILD_ROOT%{_bindir}/chsh -rm $RPM_BUILD_ROOT%{_bindir}/expiry -rm $RPM_BUILD_ROOT%{_bindir}/groups rm $RPM_BUILD_ROOT%{_bindir}/login -rm $RPM_BUILD_ROOT%{_bindir}/passwd rm $RPM_BUILD_ROOT%{_bindir}/su rm $RPM_BUILD_ROOT%{_bindir}/faillog -rm $RPM_BUILD_ROOT%{_sysconfdir}/login.access -rm $RPM_BUILD_ROOT%{_sysconfdir}/limits -rm $RPM_BUILD_ROOT%{_sbindir}/logoutd rm $RPM_BUILD_ROOT%{_sbindir}/nologin rm $RPM_BUILD_ROOT%{_mandir}/man1/chfn.* rm $RPM_BUILD_ROOT%{_mandir}/*/man1/chfn.* rm $RPM_BUILD_ROOT%{_mandir}/man1/chsh.* rm $RPM_BUILD_ROOT%{_mandir}/*/man1/chsh.* -rm $RPM_BUILD_ROOT%{_mandir}/man1/expiry.* -rm $RPM_BUILD_ROOT%{_mandir}/*/man1/expiry.* -rm $RPM_BUILD_ROOT%{_mandir}/man1/groups.* -rm $RPM_BUILD_ROOT%{_mandir}/*/man1/groups.* rm $RPM_BUILD_ROOT%{_mandir}/man1/login.* rm $RPM_BUILD_ROOT%{_mandir}/*/man1/login.* -rm $RPM_BUILD_ROOT%{_mandir}/man1/passwd.* -rm $RPM_BUILD_ROOT%{_mandir}/*/man1/passwd.* rm $RPM_BUILD_ROOT%{_mandir}/man1/su.* rm $RPM_BUILD_ROOT%{_mandir}/*/man1/su.* -rm $RPM_BUILD_ROOT%{_mandir}/man5/limits.* -rm $RPM_BUILD_ROOT%{_mandir}/*/man5/limits.* -rm $RPM_BUILD_ROOT%{_mandir}/man5/login.access.* -rm $RPM_BUILD_ROOT%{_mandir}/*/man5/login.access.* rm $RPM_BUILD_ROOT%{_mandir}/man5/passwd.* rm $RPM_BUILD_ROOT%{_mandir}/*/man5/passwd.* -rm $RPM_BUILD_ROOT%{_mandir}/man5/porttime.* -rm $RPM_BUILD_ROOT%{_mandir}/*/man5/porttime.* -rm $RPM_BUILD_ROOT%{_mandir}/man5/suauth.* -rm $RPM_BUILD_ROOT%{_mandir}/*/man5/suauth.* -rm $RPM_BUILD_ROOT%{_mandir}/man8/logoutd.* -rm $RPM_BUILD_ROOT%{_mandir}/*/man8/logoutd.* rm $RPM_BUILD_ROOT%{_mandir}/man8/nologin.* rm $RPM_BUILD_ROOT%{_mandir}/*/man8/nologin.* rm $RPM_BUILD_ROOT%{_mandir}/man3/getspnam.* @@ -269,6 +178,12 @@ rm $RPM_BUILD_ROOT%{_mandir}/*/man5/faillog.* rm $RPM_BUILD_ROOT%{_mandir}/man8/faillog.* rm $RPM_BUILD_ROOT%{_mandir}/*/man8/faillog.* +# Remove PAM service files we don't use. +rm $RPM_BUILD_ROOT%{_pam_confdir}/chfn +rm $RPM_BUILD_ROOT%{_pam_confdir}/chsh +rm $RPM_BUILD_ROOT%{_pam_confdir}/login +rm $RPM_BUILD_ROOT%{_pam_confdir}/su + find $RPM_BUILD_ROOT%{_mandir} -depth -type d -empty -delete %find_lang shadow for dir in $(ls -1d $RPM_BUILD_ROOT%{_mandir}/{??,??_??}) ; do @@ -284,21 +199,25 @@ echo $(ls) mkdir -p $RPM_BUILD_ROOT/%{includesubiddir} install -m 644 libsubid/subid.h $RPM_BUILD_ROOT/%{includesubiddir}/ -# Remove .la files created by libsubid +# Remove .la and .a files created by libsubid rm -f $RPM_BUILD_ROOT/%{_libdir}/libsubid.la +rm -f $RPM_BUILD_ROOT/%{_libdir}/libsubid.a %files -f shadow.lang %doc NEWS doc/HOWTO README %license gpl-2.0.txt shadow-bsd.txt %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/login.defs %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/default/useradd +%config(noreplace) %{_pam_confdir}/chpasswd +%config(noreplace) %{_pam_confdir}/newusers +%config(noreplace) %{_pam_confdir}/passwd %{_bindir}/sg %attr(4755,root,root) %{_bindir}/chage %attr(4755,root,root) %{_bindir}/gpasswd -%{_bindir}/lastlog %attr(4755,root,root) %{_bindir}/newgrp %attr(0755,root,root) %caps(cap_setgid=ep) %{_bindir}/newgidmap %attr(0755,root,root) %caps(cap_setuid=ep) %{_bindir}/newuidmap +%attr(4755,root,root) %{_bindir}/passwd %{_sbindir}/adduser %attr(0755,root,root) %{_sbindir}/user* %attr(0755,root,root) %{_sbindir}/group* @@ -316,6 +235,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libsubid.la %{_mandir}/man1/newgrp.1* %{_mandir}/man1/newgidmap.1* %{_mandir}/man1/newuidmap.1* +%{_mandir}/man1/passwd.* %{_mandir}/man3/shadow.3* %{_mandir}/man5/shadow.5* %{_mandir}/man5/login.defs.5* @@ -331,7 +251,6 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libsubid.la %{_mandir}/man8/chgpasswd.8* %{_mandir}/man8/newusers.8* %{_mandir}/man8/*conv.8* -%{_mandir}/man8/lastlog.8* %{_mandir}/man8/vipw.8* %{_mandir}/man8/vigr.8* @@ -345,15 +264,221 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libsubid.la %{_libdir}/libsubid.so %changelog -* Mon Oct 17 2022 Iker Pedrosa - 2:4.9-12 +* Wed Jul 29 2026 Iker Pedrosa - 2:4.20.0-1 +- Rebase to version 4.20.0 + +* Wed Jul 22 2026 Iker Pedrosa - 2:4.20.0-rc3-1 +- Rebase to version 4.20.0-rc3 + +* Fri Jul 17 2026 Fedora Release Engineering - 2:4.19.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Wed May 27 2026 Iker Pedrosa - 2:4.19.3-3 +- Enable use of PAM for chpasswd and newusers + Resolves: #2461179 and #2283963 + +* Thu Apr 23 2026 Iker Pedrosa - 2:4.19.3-2 +- btrfs: simplify checks improve useradd behavior for non-btrfs + +* Wed Feb 11 2026 Debarshi Ray - 2:4.19.3-1 +- Rebase to version 4.19.3 + Resolves: #2426288 + +* Tue Jan 27 2026 Adam Williamson - 2:4.19.0-6 +- chkhash.c: fix escaping in SHA-256 / SHA-512 / MD5 regexes + +* Mon Jan 26 2026 Iker Pedrosa - 2:4.19.0-5 +- chkhash.c: fix support for ! and * in hashes +- usermod.c: add back optimizations + +* Sat Jan 17 2026 Fedora Release Engineering - 2:4.19.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Mon Jan 12 2026 Iker Pedrosa - 2:4.19.0-3 +- useradd: Support config for creating home dirs as Btrfs subvolumes + +* Fri Jan 9 2026 Iker Pedrosa - 2:4.19.0-2 +- Enable unit-tests + +* Fri Jan 9 2026 Iker Pedrosa - 2:4.19.0-1 +- Rebase to version 4.19.0 + Resolves: #2426288 and #2249524 + +* Tue Nov 25 2025 Adam Williamson - 2:4.18.0-7 +- Also revert changes from -4 (last known good was -3) + +* Tue Nov 25 2025 Adam Williamson - 2:4.18.0-6 +- Revert changes from -5 (they were only meant for testing) + +* Tue Nov 25 2025 Iker Pedrosa - 2:4.18.0-5 +- Test CI + +* Fri Oct 31 2025 Iker Pedrosa - 2:4.18.0-4 +- Stop setting SELinux labels in chroot and prefix environments + Resolves: #2249524 + +* Tue Jul 29 2025 Alexey Tikhonov - 2:4.18.0-3 +- Revert "Stop assigning subids by default" + Resolves: #2382662 + +* Fri Jul 25 2025 Fedora Release Engineering - 2:4.18.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Tue Jul 22 2025 Iker Pedrosa - 2:4.18.0-1 +- Rebase to version 4.18.0. Resolves: #2374710 + +* Fri Jul 18 2025 Iker Pedrosa - 2:4.17.4-5 +- Stop assigning subids by default + Resolves: CVE-2024-56433 and #2334168 + +* Tue Jul 15 2025 Iker Pedrosa - 2:4.17.4-4 +- FSWC: Migrate to lastlog2 + Link: + Resolves: #2361588 + +* Tue Mar 25 2025 Iker Pedrosa - 2:4.17.4-2 +- Add pam dependency for _pam_confdir missing macro. Resolves: #2354806 + +* Thu Mar 20 2025 Iker Pedrosa - 2:4.17.4-1 +- Rebase to version 4.17.4. Resolves: #2353491 +- Fixes problems with expiration dates + +* Sat Feb 01 2025 Björn Esser - 2:4.17.0-5 +- Add explicit BR: libxcrypt-devel + +* Sun Jan 19 2025 Fedora Release Engineering - 2:4.17.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sun Jan 12 2025 Zbigniew Jędrzejewski-Szmek - 2:4.17.0-3 +- Rebuilt for the bin-sbin merge (2nd attempt) + +* Thu Dec 26 2024 Iker Pedrosa - 2:4.17.0 +- Rebase to version 4.17.0. Resolves: #2293678 + +* Sun Dec 22 2024 Björn Esser - 2:4.17.0~rc1-2 +- Remove potentially dangerous {C,LD}FLAGS shenanigans +- Fail linking if there are undefined symbols at link-time + +* Mon Dec 9 2024 Iker Pedrosa - 2:4.17.0~rc1-1 +- Rebase to version 4.17.0-rc1 + +* Tue Nov 12 2024 Iker Pedrosa - 2:4.16.0-7 +- SPDX license migration for subpackages + +* Wed Oct 16 2024 Iker Pedrosa - 2:4.16.0-6 +- Rebuilt for libeconf soname bump + +* Mon Oct 7 2024 Iker Pedrosa - 2:4.16.0-5 +- useradd: fix write_full() return value. Resolves: #2313559 + +* Fri Sep 13 2024 Iker Pedrosa - 2:4.16.0-3 +- Disable nscd + +* Wed Aug 28 2024 Iker Pedrosa - 2:4.16.0-2 +- Rebase to version 4.16.0 (#2293678) + +* Tue Jul 23 2024 Kevin Fenzi - 2:4.15.1-9 +- Revert chpasswd: use PAM again for now. + +* Sat Jul 20 2024 Fedora Release Engineering - 2:4.15.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Jul 09 2024 Zbigniew Jędrzejewski-Szmek - 2:4.15.1-7 +- Rebuilt for the bin-sbin merge + +* Thu May 30 2024 Iker Pedrosa - 2:4.15.1-6 +- chpasswd: use PAM again (#2283963) + +* Mon May 20 2024 Iker Pedrosa - 2:4.15.1-5 +- Several fixes for issues detected by static analyzer tools + +* Thu Apr 11 2024 Zbigniew Jedrzejewski-Szmek - 2:4.15.1-4 +- Fix build with %%_bindir==%%_sbindir +- Add virtual Provides for old file paths used by other packages + +* Thu Mar 21 2024 Iker Pedrosa - 2:4.15.1-2 +- getdef: avoid spurious error messages about unknown configuration options. + Resolves: #2265291 + +* Tue Mar 12 2024 Iker Pedrosa - 2:4.15.1-1 +- Wrong versioning for 4.15.0 RC releases makes the oficial release look lower than them. + Fix it by bumping the minor release to 4.15.1. Resolves: #2268690 + +* Mon Mar 11 2024 Iker Pedrosa - 2:4.15.0-1 +- Rebase to version 4.15.0 + +* Mon Feb 12 2024 Iker Pedrosa - 2:4.14.0-6 +- Build linking `libpam` + +* Thu Feb 1 2024 Iker Pedrosa - 2:4.14.0-5 +- passwd: Provide binary from this package. Enable libpam and + disable account-tools-setuid. Provide passwd PAM service file. + Resolves: #2233275 +- passwd: provide --stdin option + +* Mon Jan 29 2024 Iker Pedrosa - 2:4.14.0-4 +- Disable SSSD support. Resolves: #2253182 + +* Sat Jan 27 2024 Fedora Release Engineering - 2:4.14.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Oct 3 2023 Iker Pedrosa - 2:4.14.0-2 +- useradd: Set proper SELinux labels for def_usrtemplate + +* Wed Aug 16 2023 Iker Pedrosa - 2:4.14.0-1 +- Rebase to version 4.14.0. Resolves: #2229000 + +* Sat Jul 22 2023 Fedora Release Engineering - 2:4.13-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 06 2023 Yaakov Selkowitz - 2:4.13-7 +- Remove unused libbsd-devel dependency + +* Mon Mar 6 2023 Iker Pedrosa - 2:4.13-6 +- Add libbsd-devel and libeconf-devel as build dependencies + +* Thu Mar 2 2023 Iker Pedrosa - 2:4.13-5 +- newuidmap and newgidmap: support passing pid as fd. Resolves: #2174752 + +* Sat Jan 21 2023 Fedora Release Engineering - 2:4.13-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Nov 23 2022 Iker Pedrosa - 2:4.13-3 +- Change SUB_UID_MIN and SUB_GID_MIN to 524288. Resolves: #2144558 + +* Mon Nov 21 2022 Florian Weimer - 2:4.13-2 +- Fix gshadow configure check (switching to glibc implementation) + +* Wed Nov 9 2022 Iker Pedrosa - 2:4.13-1 +- Rebase to version 4.13 +- SPDX license migration + +* Wed Oct 5 2022 Iker Pedrosa - 2:4.12.3-3 +- chage: Fix regression in print_date. Resolves: #2129336 + +* Fri Sep 9 2022 Iker Pedrosa - 2:4.12.3-2 - useradd: Do not reset non-existent data in {last,fail}log -* Mon Sep 19 2022 Iker Pedrosa - 2:4.9-11 -- subordinateio: also compare the owner ID. Resolves: #2118227 +* Mon Aug 22 2022 Iker Pedrosa - 2:4.12.3-1 +- Rebase to version 4.12.3. Resolves: #2117809 -* Mon Aug 22 2022 Iker Pedrosa - 2:4.9-10 +* Mon Aug 1 2022 Iker Pedrosa - 2:4.11.1-4 - useradd: modify check ID range for system users. Resolves: #2093692 +* Sat Jul 23 2022 Fedora Release Engineering - 2:4.11.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Feb 10 2022 Iker Pedrosa - 2:4.11.1-2 +- Fix explicit subid requirement for subid-devel + +* Tue Jan 25 2022 Iker Pedrosa - 2:4.11.1-1 +- Rebase to version 4.11.1 (#2034038) +- Fix release sources +- Add explicit subid requirement for subid-devel + +* Sat Jan 22 2022 Fedora Release Engineering - 2:4.9-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Jan 17 2022 Iker Pedrosa - 2:4.9-9 - nss: get shadow_logfd with log_get_logfd() (#2038811) - lib: make shadow_logfd and Prog not extern @@ -370,11 +495,14 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libsubid.la * Fri Nov 12 2021 Iker Pedrosa - 2:4.9-7 - useradd: change SELinux labels for home files (#2022658) -* Tue Nov 9 2021 Iker Pedrosa - 2:4.9-6 +* Thu Nov 4 2021 Iker Pedrosa - 2:4.9-6 - useradd: revert fix memleak of grp (#2018697) -* Tue Nov 2 2021 Iker Pedrosa - 2:4.9-5 +* Wed Oct 27 2021 Iker Pedrosa - 2:4.9-5 - useradd: generate home and mail directories with selinux user attribute + +* Thu Sep 23 2021 Iker Pedrosa - 2:4.9-4 +- login.defs: include HMAC_CRYPTO_ALGO key - Clean spec file: organize dependencies and move License location * Tue Aug 17 2021 Iker Pedrosa - 2:4.9-3 diff --git a/sources b/sources index 803fac0..7669083 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (shadow-4.9.tar.xz) = 254cda49bb14505a7604821e7fa898bf4bf317d648e9ddc881ab80a6860d52053dfffacad6feab87c7d16608c35ed6b6cee99e7757eac930da3a7b31cdcd4b95 -SHA512 (shadow-4.9.tar.xz.asc) = 16c0ff7be263c9d471b05656c9a1d14da8ec9b17544910323ca6ab854126d1a03ece221e0caf610e65a9b1d080b4cd1b8b46973f20e3ae45ea0e5581ce6c90d9 +SHA512 (shadow-4.20.0.tar.xz) = 0b8afded372e4d37a78f38cb972c0ab877870ef6356cdd1c45be3c708af3d1496c6f87de6bf6a5b1d217d4d52d7e2d15c28b26530949cc6de0231a4028930406 +SHA512 (shadow-4.20.0.tar.xz.asc) = e4b134543768f323df30a1e450c22086d013020928d62bd3207db7f633beea3587b67802da5b575d5a794e8c2bebd7a0abeba6ed69d44bf08adc37df3bf352ac diff --git a/tests/mhc-fedora-ci.yaml b/tests/mhc-fedora-ci.yaml new file mode 100644 index 0000000..8747e67 --- /dev/null +++ b/tests/mhc-fedora-ci.yaml @@ -0,0 +1,13 @@ +provisioned_topologies: +- shadow +domains: +- id: shadow + hosts: + - hostname: localhost + role: shadow + conn: + type: ssh + host: localhost + user: root + artifacts: + - /var/log/* diff --git a/tests/sanity/Makefile b/tests/sanity/Makefile deleted file mode 100644 index 386221b..0000000 --- a/tests/sanity/Makefile +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright (c) 2006 Red Hat, Inc. All rights reserved. This copyrighted material -# is made available to anyone wishing to use, modify, copy, or -# redistribute it subject to the terms and conditions of the GNU General -# Public License v.2. -# -# This program is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# Author: Jakub Hrozek - -#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~# -# Example Makefile for RHTS # -# This example is geared towards a test for a specific package # -# It does most of the work for you, but may require further coding # -#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~# - -# The toplevel namespace within which the test lives. -TOPLEVEL_NAMESPACE=CoreOS - -# The name of the package under test: -PACKAGE_NAME=shadow-utils - -# The path of the test below the package: -RELATIVE_PATH=sanity - -# Version of the Test. Used with make tag. -export TESTVERSION=1.1 - -# The combined namespace of the test. -export TEST=/$(TOPLEVEL_NAMESPACE)/$(PACKAGE_NAME)/$(RELATIVE_PATH) - -# A phony target is one that is not really the name of a file. -# It is just a name for some commands to be executed when you -# make an explicit request. There are two reasons to use a -# phony target: to avoid a conflict with a file of the same -# name, and to improve performance. -.PHONY: all install download clean - -# Executables to be built should be added here, they will be generated on the system under test. -BUILT_FILES= - -# Data files, .c files, scripts anything needed to either compile the test and/or run it. -FILES=$(METADATA) Makefile PURPOSE sanity_test.py runtest.sh - -run: $(FILES) build - ./runtest.sh - -build: $(BUILT_FILES) - chmod a+x ./sanity_test.py - chmod a+x ./runtest.sh - -clean: - rm -f *~ *.rpm $(BUILT_FILES) - -# Include Common Makefile -include /usr/share/rhts/lib/rhts-make.include - -# Generate the testinfo.desc here: -$(METADATA): Makefile - @touch $(METADATA) - @echo "Owner: Jakub Hrozek " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "License: GNU GPL" >> $(METADATA) - @echo "Description: Basic sanity test for shadow-utils" >> $(METADATA) - @echo "TestTime: 5m" >> $(METADATA) - @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA) - @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA) - @echo "Requires: python" >> $(METADATA) - rhts-lint $(METADATA) - diff --git a/tests/sanity/PURPOSE b/tests/sanity/PURPOSE deleted file mode 100644 index 27062e1..0000000 --- a/tests/sanity/PURPOSE +++ /dev/null @@ -1,10 +0,0 @@ -This is a basic sanity test for the shadow-utils package. It is implemented -in python on top of the unittesting.py module. - -Its purpose is to ensure that the binaries in the shadow-utils package behave -as expected and its switches/options work correctly. - -For the most part, every binary in the shadow-utils package is represented by -a single class named Test, i.e. TestUsermod etc. There are some -exceptions, like TestUseraddWeirdNameTest though. - diff --git a/tests/sanity/runtest.sh b/tests/sanity/runtest.sh deleted file mode 100755 index cb2a2b5..0000000 --- a/tests/sanity/runtest.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -. /usr/bin/rhts-environment.sh -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -rlJournalStart -rlFileBackup --clean /etc/default/useradd- /etc/default/useradd -setenforce 0 -python sanity_test.py -v -setenforce 1 -rlFileRestore - -EXIT=$? -if [[ $EXIT -eq 0 ]]; then - RESULT="PASS" -else - RESULT="FAIL" -fi - - -rlJournalEnd - -echo "Result: $RESULT" -echo "Exit: $EXIT" -report_result $TEST $RESULT $EXIT diff --git a/tests/sanity/sanity_test.py b/tests/sanity/sanity_test.py deleted file mode 100755 index e9c45c2..0000000 --- a/tests/sanity/sanity_test.py +++ /dev/null @@ -1,1013 +0,0 @@ -#!/usr/bin/env python -""" -A script that tests functionality of the shadow-utils package. - -Author: Jakub Hrozek, -License: GNU GPL v2 -Date: 2007 - -TODO: - * tests for password aging - * if something fails, print out the command issued for easier debugging - * test long options variants along with the short ones -""" - -import unittest -import pwd -import grp -import commands -import os -import os.path -import sys -import copy -import tempfile -import rpm -import shutil - -from UserDict import UserDict - -class RedHatVersion(object): - def __init__(self, type=None, version=None, release=None): - self.type = type - self.version = version - self.release = release - self.rhel = False - - def __eq__( self, other): - """ - Don't compare if either of the values is None - so we can do comparisons like 'is it fedora?' or 'is it rhel4?' - """ - ok = (self.type == other.type) - if ok == False: return False - - if self.version and other.version: - ok = (self.version == other.version) - if ok == False: return False - - if (self.release == other.release): - ok = (self.release == other.release) - - return ok - - def __ne__( self, other): - return not self.__eq__(other) - - def __get_fedora_info(self, mi): - return [ (h['version'],h['release']) for h in mi ][0] - - def __get_rhel_info(self, mi): - # The rules for RHEL versions are braindead..releases even more - ver_rpm, rel_rpm = [ (h['version'],h['release']) for h in mi ][0] - rhel_versions = { '3AS' : 3, '4AS' : 4, '5Server' : 5, '5Client' : 5, '6' : 6 } - if ver_rpm[:3] == '5.9' or ver_rpm[:1] == '6': # rhel6 prerelease and release hack - rhel_versions[ver_rpm] = 6 - if ver_rpm in rhel_versions.keys(): - return (rhel_versions[ver_rpm], rel_rpm) - - def is_rhel(self): - return self.rhel - - def get_info(self): - """ - Returns a tuple containing (type, version, release) of RHEL or Fedora. - Type is either RHEL or Fedora. - Returns None if it cannot parse the info - """ - - ts = rpm.TransactionSet() - mi = ts.dbMatch() - mi.pattern('name', rpm.RPMMIRE_GLOB, 'redhat-release*') - - if mi: - self.rhel = True - return ('RHEL',) + self.__get_rhel_info(mi) - else: - mi = ts.dbMatch('name','fedora-release') - self.rhel = False - if mi.count() != 0: - return ('Fedora',) + self.__get_fedora_info(mi) - - return None - - -class UserInfo(UserDict): - fields = { "pw_name" : 0, "pw_passwd" : 1, "pw_uid" : 2, "pw_gid" : 3, - "pw_gecos" : 4, "pw_dir" : 5, "pw_shell" : 6 } - - def __init__(self): - UserDict.__init__(self) - for f in UserInfo.fields: self[f] = None - - def __getitem__(self, key): - return UserDict.__getitem__(self, key) - - def __setitem__(self, key, value): - UserDict.__setitem__(self, key, value) - - def __cmp__(self, other): - return UserDict.__cmp__(self, other) - - def __repr__(self): - return " ; ".join( [ "%s => %s" % (k, v) for k, v in self.data.items() ] ) - - def __parse_info(self, struct): - for f in UserInfo.fields: - self[f] = struct[UserInfo.fields[f]] - - def get_info_uid(self, uid): - self.__parse_info(pwd.getpwuid(uid)) - - def get_info_name(self, name): - try: - self.__parse_info(pwd.getpwnam(name)) - except KeyError: - return None - - def lazy_compare(self, pattern): - """ Compare pattern against self. If any field in pattern is set - to None, it is automatically considered equal with the corresponding - field in self. """ - for field in UserInfo.fields: - if pattern[field] and pattern[field] != self[field]: - return False - - return True - -class GroupInfo(UserDict): - fields = { "gr_name" : 0, "gr_passwd" : 1, - "gr_gid" : 2, "gr_mem" : 3} - - def __init__(self): - UserDict.__init__(self) - for f in GroupInfo.fields: self[f] = None - - def __getitem__(self, key): - return UserDict.__getitem__(self, key) - - def __setitem__(self, key, value): - UserDict.__setitem__(self, key, value) - - def __cmp__(self, other): - return UserDict.__cmp__(self, other) - - def __repr__(self): - return " ; ".join( [ "%s => %s" % (k, v) for k, v in self.data.items() ] ) - - def __parse_info(self, struct): - for f in GroupInfo.fields: - self[f] = struct[GroupInfo.fields[f]] - - def get_info_gid(self, gid): - self.__parse_info(grp.getgrgid(gid)) - - def get_info_name(self, name): - self.__parse_info(grp.getgrnam(name)) - - def lazy_compare(self, pattern): - """ Compare pattern against self. If any field in pattern is set - to None, it is automatically considered equal with the corresponding - field in self. """ - for field in GroupInfo.fields: - if pattern[field] and pattern[field] != self[field]: - return False - - return True - -class LoginDefsParser(UserDict): - "A quick-n-dirty way how to fetch the defaults from /etc/login.defs into a dictionary" - - def __getitem__(self, key): - try: - return UserDict.__getitem__(self, key) - except KeyError: - # if a name-value is not defined in the config file, return defaults - if key == "CREATE_MAIL_SPOOL": - return "yes" - if key == "UMASK": - return "077" - - def __init__(self, path="/etc/login.defs",split=None): - self.path = path - UserDict.__init__(self) - try: - defs = open(path) - except IOError: - print "Could not open the config file %s" % (path) - - for line in defs: - if line.startswith('#'): continue - fields = line.split(split) - if len(fields) != 2: continue # yeah, we're dirty - self.data[fields[0]] = fields[1] - - def serialize(self): - output = open(self.path, "w+") - for k,v in self.data.items(): - output.write("%s=%s" % (k, v)) - - output.write("\n") - output.close() - -class TestUserInfo(unittest.TestCase): - def testLazyCompare(self): - """ (test sanity): Test comparing two UserInfo records """ - a = UserInfo() - a["pw_name"] = "foo" - a["pw_uid"] = 555 - b = copy.deepcopy(a) - c = UserInfo() - - self.assertEqual(a.lazy_compare(b), True) - self.assertEqual(a.lazy_compare(c), True) - - c["pw_name"] = "foo" - c["pw_uid"] = None - self.assertEqual(a.lazy_compare(c), True) - self.assertEqual(c.lazy_compare(a), False) - - c["pw_name"] = "bar" - self.assertNotEqual(a.lazy_compare(c), True) - - def testGetInfoUid(self): - """ (test sanity): Test getting user info based on his UID """ - a = UserInfo() - a.get_info_uid(0) - self.assertEqual(a["pw_name"], "root") - - def testGetInfoName(self): - """ (test sanity): Test getting user info based on his name """ - a = UserInfo() - a.get_info_name("root") - self.assertEqual(a["pw_uid"], 0) - -class ShadowUtilsTestBase: - """ Handy routines """ - def getDefaults(self): - # get the default values for so we can compare against that - (status, defaults_str) = commands.getstatusoutput('useradd -D') - if status != 0: - raise RuntimeError("Could not get the default values for useradd") - return dict([ rec.split("=") for rec in defaults_str.split("\n") ]) - - def getDefaultUserInfo(self, username): - expected = UserInfo() - defaults = self.getDefaults() - - expected["pw_name"] = username - expected["pw_dir"] = defaults["HOME"] + "/" + username - expected["pw_shell"] = defaults["SHELL"] - - return expected - -class TestUseradd(ShadowUtilsTestBase, unittest.TestCase): - def setUp(self): - self.username = "test-shadow-utils-useradd" - - def tearDown(self): - commands.getstatusoutput("userdel -r %s" % (self.username)) - - def testBasicAdd(self): - """ useradd: Tests basic adding of a user """ - expected = self.getDefaultUserInfo(self.username) - - runme = "useradd %s" % (self.username) - (status, output) = commands.getstatusoutput(runme) - self.failUnlessEqual(status, 0, output) - - created = UserInfo() - created.get_info_name(self.username) - self.assertEqual(created.lazy_compare(expected), True, "FAIL: Could not add a user\nIssued command: %s" % (runme)) - - def testExistingUser(self): - """ useradd: Test that user with an existing name cannot be added """ - (status, output) = commands.getstatusoutput("useradd %s" % (self.username)) - self.failUnlessEqual(status, 0, output) - self.assertNotEqual(commands.getstatusoutput("useradd %s" % (self.username))[0], 0, "FAIL: User that already exists added") - - def testCustomUID(self): - """ useradd: Adding an user with a specific UID """ - UID = 23456 # FIXME - test for a free UID slot first - - expected = self.getDefaultUserInfo(self.username) - expected["pw_uid"] = UID - - runme = "useradd %s -u %d" % (self.username, UID) - (status, output) = commands.getstatusoutput(runme) - self.failUnlessEqual(status, 0, "Issued command: %s\n" % (runme) + "Got from useradd: %s\n" % (output)) - - created = UserInfo() - created.get_info_name(self.username) - self.assertEqual(created.lazy_compare(expected), True, "FAIL: Could not add a user with a specific UID\nIssued command: %s" % (runme)) - - def testNegativeUID(self): - """ useradd: Tests that user cannot have a negative UID assigned """ - self.assertNotEqual(commands.getstatusoutput("useradd %s --uid -5" % (self.username))[0], 0, "FAIL: User with UID < 0 added") - - def testCustomExistingUID(self): - """ useradd: Adding a user with a specific existing UID """ - UID = 32112 - - expected = self.getDefaultUserInfo(self.username) - expected["pw_uid"] = UID - - (status_u, output_u) = commands.getstatusoutput("useradd %s -u %d" % (self.username, UID)) - - # must fail without -o flag - (status_u_no_o, output_u_no_o) = commands.getstatusoutput("useradd foo -u %d" % (UID)) - - # must pass with -o flag - (status_o, output_o) = commands.getstatusoutput("useradd foo -u %d -o" % (UID)) - - # clean up - (status, output) = commands.getstatusoutput("userdel -r foo") - - self.failUnlessEqual(status_u, 0, "FAIL: cannot add an user with a specified UID\n"+output_u) - self.assertEqual(status_o, 0, "FAIL: cannot add an user with an existing UID using the -o flag\n"+output_o) - self.failUnlessEqual(status, 0, output) - self.assertNotEqual(status_u_no_o, 0, "FAIL: user with an existing UID added\n"+output_u_no_o) - - def testCustomGID(self): - """ useradd: Adding an user with a specific GID """ - GID = 100 # users group should be everywhere - should we test before? - expected = self.getDefaultUserInfo(self.username) - expected["pw_gid"] = GID - - (status, output) = commands.getstatusoutput("useradd %s -g %d" % (self.username, GID)) - self.failUnlessEqual(status, 0, output) - - created = UserInfo() - created.get_info_name(self.username) - self.assertEqual(created.lazy_compare(expected), True, "FAIL: Could not add a user with a specific GID") - - def testCustomShell(self): - """ useradd: Adding an user with a specific login shell """ - shell = "/bin/ksh" - expected = self.getDefaultUserInfo(self.username) - expected["pw_shell"] = shell - - (status, output) = commands.getstatusoutput("useradd %s -s %s" % (self.username, shell)) - self.failUnlessEqual(status, 0, output) - - created = UserInfo() - created.get_info_name(self.username) - self.assertEqual(created.lazy_compare(expected), True, "FAIL: Could not add a user with a specific shell") - - def testCustomHome(self): - """ useradd: Adding an user with a specific home directory """ - home = "/tmp/useradd-test" - os.mkdir(home) - expected = self.getDefaultUserInfo(self.username) - expected["pw_dir"] = home - - (status, output) = commands.getstatusoutput("useradd %s -d %s" % (self.username, home)) - shutil.rmtree(home) - self.failUnlessEqual(status, 0, output) - - created = UserInfo() - created.get_info_name(self.username) - self.assertEqual(created.lazy_compare(expected), True, "FAIL: Could not add a user with a specific home") - - def testSystemAccount(self): - """ useradd: Adding a system user (UID < UID_MIN from /etc/login.defs) """ - defaults = LoginDefsParser() - - # system account with no home dir - expected = self.getDefaultUserInfo(self.username) - - (status, output) = commands.getstatusoutput("useradd -r %s" % (self.username)) - self.failUnlessEqual(status, 0, output) - - created = UserInfo() - created.get_info_name(self.username) - self.assertEqual(os.path.exists(created["pw_dir"]), False, "FAIL: System user has a home dir created") - self.assertEqual(created["pw_uid"] < defaults['UID_MIN'], True, "FAIL: System user has UID > UID_MIN") - self.assertEqual(created.lazy_compare(expected), True, "FAIL: Could not add a system user") - - def testAddToMoreGroups(self): - """ useradd: Creating an user that belongs to more than one group """ - (status, output) = commands.getstatusoutput("useradd -G bin %s" % (self.username)) - self.failUnlessEqual(status, 0, output) - - gr_bin = GroupInfo() - gr_bin.get_info_name("bin") - self.assertEqual(self.username in gr_bin["gr_mem"], True, "FAIL: User not in supplementary group after usermod -G -a") - - - def testAddWithCommonName(self): - """ useradd: Specifying a comment (user for account name) """ - comment = "zzzzzz" - (status, output) = commands.getstatusoutput("useradd -c %s %s" % (comment, self.username)) - self.failUnlessEqual(status, 0, output) - - created = UserInfo() - created.get_info_name(self.username) - self.assertEqual(created["pw_gecos"], comment, "FAIL: failed to create a user with a GECOS comment") - - def testHomePermissions(self): - """ useradd: Check if permissions on newly created home dir match the umask """ - defaults = LoginDefsParser() - - (status, output) = commands.getstatusoutput("useradd %s" % (self.username)) - self.failUnlessEqual(status, 0, output) - - created = UserInfo() - created.get_info_name(self.username) - - import stat - perm = os.stat(created["pw_dir"])[stat.ST_MODE] - mode = int(oct(perm & 0777)) - - self.assertEqual(defaults["UMASK"], "077", "FAIL: umask setting is not sane - is %s, should be 077" % (defaults["UMASK"])) - self.assertEqual(int(defaults["UMASK"]) + mode , 777, "FAIL: newly-created home dir does not match the umask") - - def testCreateMailSpool(self): - """ useradd: Check whether the mail spool gets created when told to""" - # set up creating of mail spool - defaults = LoginDefsParser("/etc/default/useradd", split="=") - - create_mail = defaults["CREATE_MAIL_SPOOL"] - defaults["CREATE_MAIL_SPOOL"] = "yes" - defaults.serialize() - - login_defs = LoginDefsParser() - - (status, output) = commands.getstatusoutput("useradd %s" % (self.username)) - self.failUnlessEqual(status, 0, output) - - # clean up - defaults["CREATE_MAIL_SPOOL"] = create_mail - defaults.serialize() - self.assertEqual(os.path.exists(login_defs["MAIL_DIR"] + "/" + self.username), True, "FAIL: useradd did not create mail spool") - - def testDefaultMailSettings(self): - """ useradd: Check whether the mail spool is on by default""" - defaults = LoginDefsParser("/etc/default/useradd", split="=") - self.assertEqual(defaults["CREATE_MAIL_SPOOL"], "yes\n") - - def testNoLastlog(self): - """ useradd: Check if the -l option prevents from being added to the lastlog """ - pass # FIXME - add some code here - - -class TestUseraddWeirdNameTest(unittest.TestCase, ShadowUtilsTestBase): - """ Tests addition/removal of usernames that have proven to be problematic in the past. - The reason to separate these from the main useradd test suite is to not run the setUp - and tearDown methods """ - - def addAndRemove(self, username, success=True): - expected = self.getDefaultUserInfo(username) - expected["pw_name"] = username - - (status, output) = commands.getstatusoutput("useradd %s" % (username)) - if success: - self.failUnlessEqual(status, 0, output) - else: - self.failIfEqual(status, 0, output) - return True - - created = UserInfo() - created.get_info_name(username) - self.assertEqual(created.lazy_compare(expected), True, "FAIL: TestUseraddWeirdName::addAndRemove - could not add a user") - - # the cleanup method won't help this time - (status, output) = commands.getstatusoutput("userdel -r %s" % (username)) - self.failUnlessEqual(status, 0, output) - - def testNumericName(self): - """ useradd: Test if an user with a purely numerical name can be added (123) """ - return self.addAndRemove("123") - - def testSambaName(self): - """ useradd: Test if an user with a name with a dollar at the end can be added (joepublic$ ) """ - return self.addAndRemove("joepublic$") - - def testDotInName(self): - """ useradd: Test if an user with a name with a dot in it can be added (joe.public ) """ - return self.addAndRemove("joe.public") - - def testAtInName(self): - """ useradd: Test if an user with an '@' in name can be added (joe@public.com) - should fail """ - return self.addAndRemove("joe@public.com", False) - - def testUppercase(self): - """ useradd: Test if an user with UPPERCASE or Uppercase name can be added """ - return self.addAndRemove("JOEPUBLIC") - return self.addAndRemove("Joepublic") - -class TestUseraddDefaultsChange(unittest.TestCase, ShadowUtilsTestBase): - def testDefaultsChange(self): - """ useradd: Test overriding default settings (shell, home dir, group) with a -D option """ - save = self.getDefaults() - - new_defs = dict() - new_defs["SHELL"] = "/bin/ksh" - new_defs["GROUP"] = "1" - new_defs["HOME"] = "/tmp" - - command = "useradd -D -s%s -g%s -b%s" % (new_defs["SHELL"], new_defs["GROUP"], new_defs["HOME"]) - (status, output) = commands.getstatusoutput(command) - self.failUnlessEqual(status, 0, output) - - overriden = self.getDefaults() - [ self.assertEqual(overriden[k], new_defs[k]) for k in new_defs.keys() ] - - command = "useradd -D -s%s -g%s -b%s" % (save["SHELL"], save["GROUP"], save["HOME"]) - (status, output) = commands.getstatusoutput(command) - self.failUnlessEqual(status, 0, output) - - -class TestUserdel(unittest.TestCase, ShadowUtilsTestBase): - def setUp(self): - self.username = "test-shadow-utils-userdel" - (status, output) = commands.getstatusoutput("useradd %s" % (self.username)) - self.failUnlessEqual(status, 0, output) - - def testRemoveUserGroup(self): - """ userdel: test if userdel removes user's group when he's deleted - regression test for #201379 """ - (status, output) = commands.getstatusoutput("userdel -r %s" % (self.username)) - self.failUnlessEqual(status, 0, output) - - # This would fail if we did not have the group removed - (status, output) = commands.getstatusoutput("useradd %s" % (self.username)) - self.failUnlessEqual(status, 0, output) - - (status, output) = commands.getstatusoutput("userdel -r %s" % (self.username)) - self.failUnlessEqual(status, 0, output) - -class TestUsermod(unittest.TestCase, ShadowUtilsTestBase): - def setUp(self): - self.username = "test-shadow-utils-usermod" - (status, output) = commands.getstatusoutput("useradd %s" % (self.username)) - self.failUnlessEqual(status, 0, output) - - def tearDown(self): - (status, output) = commands.getstatusoutput("userdel -r %s" % (self.username)) - self.failUnlessEqual(status, 0, output) - - def testAppendToSupplementaryGroup(self): - """ usermod: Test if a user can be added to a supplementary group """ - add_group = "additional_group" - (status, output) = commands.getstatusoutput("groupadd %s" % (add_group)) - self.failUnlessEqual(status, 0, output) - - (status_mod, output_mod) = commands.getstatusoutput("usermod -a -G %s %s" % (add_group, self.username)) - add_group_info = GroupInfo() - add_group_info.get_info_name(add_group) - (status, output) = commands.getstatusoutput("groupdel %s" % (add_group)) - - self.failUnlessEqual(status, 0, output) - self.failUnlessEqual(status_mod, 0, output_mod) - self.assertEqual(self.username in add_group_info["gr_mem"], True, "User not in supplementary group after usermod -G --append") - - - def testAppendToSupplementaryGroupLongOption(self): - """ usermod: Test if a user can be added to a supplementary group via --append rather that -a (regression test for 222540) """ - # this is known to not work on older RHELs - test what we are running - rhv = RedHatVersion() - runs = rhv.get_info() - if rhv.is_rhel(): - if runs[1] < 5: - print "This test makes sense for RHEL5+" - return - else: - if runs[1] < 6: - print "This test makes sense for Fedora 6+" - return - - type, release, version = RedHatVersion().get_info() - if RedHatVersion().is_rhel(): - if release < 5 or (release == 5 and version < 2): - print "This test makes sense for RHEL 5.2+" - return - - add_group = "additional_group" - (status, output) = commands.getstatusoutput("groupadd %s" % (add_group)) - self.failUnlessEqual(status, 0, output) - - (status_mod, output_mod) = commands.getstatusoutput("usermod --append -G %s %s" % (add_group, self.username)) - add_group_info = GroupInfo() - add_group_info.get_info_name(add_group) - (status, output) = commands.getstatusoutput("groupdel %s" % (add_group)) - - self.failUnlessEqual(status, 0, output) - self.failUnlessEqual(status_mod, 0, output_mod) - self.assertEqual(self.username in add_group_info["gr_mem"], True, "User not in supplementary group after usermod -G --append") - - - def testNameChange(self): - """ usermod: Test if the comment field (used as the Common Name) can be changed """ - new_comment = "zzzzzz" - - (status, output) = commands.getstatusoutput("usermod -c %s %s" % (new_comment, self.username)) - self.failUnlessEqual(status, 0, output) - - created = UserInfo() - created.get_info_name(self.username) - - self.assertEqual(created["pw_gecos"], new_comment) - - def testHomeChange(self): - """ usermod: Test if user's home directory can be changed """ - new_home = "/tmp" - created = UserInfo() - created.get_info_name(self.username) - old_home = created["pw_dir"] - - (status, output) = commands.getstatusoutput("usermod -d %s %s" % (new_home, self.username)) - self.failUnlessEqual(status, 0, output) - - created.get_info_name(self.username) - self.assertEqual(created["pw_dir"], new_home) - - # revert to old home so we can userdel -r in tearDown - (status, output) = commands.getstatusoutput("usermod -d %s %s" % (old_home, self.username)) - self.failUnlessEqual(status, 0, output) - - # FIXME - test if contents of /home directories are transferred with the -m option - # FIXME - test if new home is created if does not exist before - - def testGIDChange(self): - """ usermod: Test if user's gid can be changed. """ - new_group = "root" - # test non-existing group - (status_fail, output_fail) = commands.getstatusoutput("usermod -g no-such-group %s" % (self.username)) - (status, output) = commands.getstatusoutput("usermod -g %s %s" % (new_group, self.username)) - - created = UserInfo() - created.get_info_name(self.username) - - left = GroupInfo() - if left.get_info_name(self.username) == None: - (status_del, output_del) = commands.getstatusoutput("groupdel %s" % (self.username)) - self.failUnlessEqual(status_del, 0, output_del) - - self.failIfEqual(status_fail, 0, output_fail) - self.failUnlessEqual(status, 0, output) - self.assertEqual(created["pw_gid"], 0) #0 is root group - - def testLoginChange(self): - """ usermod: Test if user's login can be changed """ - new_login = "usermod-login-change" - user = UserInfo() - user.get_info_name(self.username) - uid = user["pw_uid"] # UID won't change even when login does - - # test changing to an existing user name - (status, output) = commands.getstatusoutput("usermod -l root %s" % (self.username)) - self.failIfEqual(status, 0, output) - - (status, output) = commands.getstatusoutput("usermod -l %s %s" % (new_login, self.username)) - self.failUnlessEqual(status, 0, output) - user.get_info_name(new_login) - self.assertEqual(user["pw_uid"], uid) - - # revert so we can userdel -r on tearDown - (status, output) = commands.getstatusoutput("usermod -l %s %s" % (self.username, new_login)) - self.failUnlessEqual(status, 0, output) - - def testShellChange(self): - """ usermod: Test if user's shell can be changed """ - new_shell = "/bin/sh" - - (status, output) = commands.getstatusoutput("usermod -s %s %s" % (new_shell, self.username)) - self.failUnlessEqual(status, 0, output) - - created = UserInfo() - created.get_info_name(self.username) - self.assertEqual(created["pw_shell"], new_shell) - -class TestGroupadd(unittest.TestCase, ShadowUtilsTestBase): - def setUp(self): - self.groupname = "test-shadow-utils-groups" - - def tearDown(self): - commands.getstatusoutput("groupdel %s" % (self.groupname)) - - def testAddGroup(self): - """ groupadd: Basic adding of a group """ - - expected = GroupInfo() - expected["gr_name"] = self.groupname - - (status, output) = commands.getstatusoutput("groupadd %s" % (self.groupname)) - self.failUnlessEqual(status, 0, output) - - created = GroupInfo() - created.get_info_name(self.groupname) - self.assertEqual(created.lazy_compare(expected), True, "FAIL: Could not add a group") - - def testAddSystemGroup(self): - """ groupadd: Adding a system group with gid < MIN_GID """ - - expected = GroupInfo() - expected["gr_name"] = self.groupname - defaults = LoginDefsParser() - - (status, output) = commands.getstatusoutput("groupadd -r %s" % (self.groupname)) - self.failUnlessEqual(status, 0, output) - - created = GroupInfo() - created.get_info_name(self.groupname) - self.assertEqual(created["gr_gid"] < defaults["GID_MIN"], True, "FAIL: System group has gid >= GID_MIN") - self.assertEqual(created.lazy_compare(expected), True, "FAIL: Could not add a system group") - - def testAddExistingGid(self): - """ groupadd: Test if we group with an existing GID can be added """ - (status, output) = commands.getstatusoutput("groupadd %s" % (self.groupname)) - self.failUnlessEqual(status, 0, output) - - gname = "%s-2" % (self.groupname) - - created = GroupInfo() - created.get_info_name(self.groupname) - - # no -o option -> this should fail - (status, output) = commands.getstatusoutput("groupadd -g%s %s" % (created["gr_gid"], gname)) - self.failIfEqual(status, 0, output) - - # override with -o option, should pass now - (status, output) = commands.getstatusoutput("groupadd -g%s -o %s" % (created["gr_gid"], gname)) - self.failUnlessEqual(status, 0, output) - - # test if the new GID is really the same - same_gid = GroupInfo() - same_gid.get_info_name(gname) - self.assertEqual(same_gid["gr_gid"], created["gr_gid"]) - - # clean up - (status, output) = commands.getstatusoutput("groupdel %s" % (gname)) - self.failUnlessEqual(status, 0, output) - - - def testOverrideDefaults(self): - """ groupadd: Test if the defaults can be overriden with the -K option """ - # this is known to not work on older RHELs - test what we are running - rhv = RedHatVersion() - runs = rhv.get_info() - if rhv.is_rhel(): - if runs[1] < 5: - print "This test makes sense for RHEL5+" - return - else: - if runs[1] < 6: - print "This test makes sense for Fedora 6+" - return - - - GID_MIN = 600 - GID_MAX = 625 - - (status, output) = commands.getstatusoutput("groupadd -K GID_MIN=%d -K GID_MAX=%d %s" % - (GID_MIN, GID_MAX, self.groupname)) - self.failUnlessEqual(status, 0, output) - - created = GroupInfo() - created.get_info_name(self.groupname) - self.assertEqual(GID_MIN <= created["gr_gid"] <= GID_MAX, True, "FAIL: created an user with UID of %d" % (created["gr_gid"])) - - - def testFOption(self): - """ groupadd: Tests the -f option of groupadd """ - (status, output) = commands.getstatusoutput("groupadd %s" % (self.groupname)) - self.failUnlessEqual(status, 0, output) - - (status, output) = commands.getstatusoutput("groupadd -f %s" % (self.groupname)) - self.assertEqual(status, 0, output) - -class TestGroupaddInvalidName(unittest.TestCase, ShadowUtilsTestBase): - def testGroupaddInvalidName(self): - """ groupadd: Test adding of a group with an invalid name """ - (status, output) = commands.getstatusoutput("groupadd foo?") - self.assertNotEqual(status, 0, output) - (status, output) = commands.getstatusoutput("groupadd aaaaabbbbbcccccdddddeeeeefffffggg") #33 chars - self.assertNotEqual(status, 0, output) - -class TestGroupaddValidName(unittest.TestCase, ShadowUtilsTestBase): - def testGroupaddValidName(self): - """ groupadd: Test adding and removing of groups with maximal valid name and name ending with $ """ - (status, output) = commands.getstatusoutput("groupadd aaaaabbbbbcccccdddddeeeeefffffgg") #32 chars - self.assertEqual(status, 0, output) - (status, output) = commands.getstatusoutput("groupadd aaaaabbbbbcccccdddddeeeeefffffg\$") #32 chars - self.assertEqual(status, 0, output) - (status, output) = commands.getstatusoutput("groupdel aaaaabbbbbcccccdddddeeeeefffffgg") #32 chars - self.assertEqual(status, 0, output) - (status, output) = commands.getstatusoutput("groupdel aaaaabbbbbcccccdddddeeeeefffffg\$") #32 chars - self.assertEqual(status, 0, output) - - -class TestGroupmod(unittest.TestCase, ShadowUtilsTestBase): - def setUp(self): - self.groupname = "test-shadow-utils-groups" - (status, output) = commands.getstatusoutput("groupadd %s" % (self.groupname)) - self.failUnlessEqual(status, 0, output) - - def tearDown(self): - commands.getstatusoutput("groupdel %s" % (self.groupname)) - - def testChangeGID(self): - """ groupmod: Test changing a gid of a group """ - expected = GroupInfo() - expected["gr_name"] = self.groupname - expected["gr_gid"] = 54321 - - (status, output) = commands.getstatusoutput("groupmod -g%d %s" % (expected["gr_gid"], self.groupname)) - self.failUnlessEqual(status, 0, output) - - created = GroupInfo() - created.get_info_name(self.groupname) - self.assertEqual(created.lazy_compare(expected), True, "FAIL: Could not change GID of an existing group") - - def testChangeGIDToExistingValue(self): - """ groupmod: Test changing GID to an existing value """ - second_name = "%s-2" % (self.groupname) - - created = GroupInfo() - created.get_info_name(self.groupname) - - expected = GroupInfo() - expected["gr_name"] = self.groupname - expected["gr_gid"] = created["gr_gid"] - - (status, output) = commands.getstatusoutput("groupadd %s" % (second_name)) - self.failUnlessEqual(status, 0, output) - - # try to assingn GID of the first group to the second - this should fail without the -o option - (status, output) = commands.getstatusoutput("groupmod -g%d %s" % (created["gr_gid"], second_name)) - self.failIfEqual(status, 0, output) - - # should pass with the -o option - (status, output) = commands.getstatusoutput("groupmod -g%d -o %s" % (created["gr_gid"], second_name)) - self.failUnlessEqual(status, 0, output) - - self.assertEqual(created.lazy_compare(expected), True, "FAIL: Could not change GID of an existing group to an existing one") - - # clean up - commands.getstatusoutput("groupdel %s" % (second_name)) - self.failUnlessEqual(status, 0, output) - - def testChangeGroupName(self): - """ groupmod: Test changing a group's name """ - second_name = "%s-2" % (self.groupname) - - created = GroupInfo() - created.get_info_name(self.groupname) - - (status, output) = commands.getstatusoutput("groupmod -n%s %s" % (second_name, self.groupname)) - self.failUnlessEqual(status, 0, output) - - changed = GroupInfo() - changed.get_info_gid(created["gr_gid"]) - self.assertEqual(changed["gr_name"], second_name) - self.assertEqual(changed["gr_gid"], created["gr_gid"]) - - # change back, so the group could be deleted by tearDown - (status, output) = commands.getstatusoutput("groupmod -n%s %s" % (self.groupname, second_name)) - self.failUnlessEqual(status, 0, output) - - def testChangeGroupNameExisting(self): - """ groupmod: Test changing a group's name to an existing one """ - existing = "bin" - (status, output) = commands.getstatusoutput("groupmod -n%s %s" % (existing, self.groupname)) - self.assertNotEqual(status, 0, output) # man groupmod -> 9: group name already in use - - def testChangeNonExistingGroup(self): - """ groupmod: Test properties of a non-existing group """ - nonexistent = "foobar" - (status, output) = commands.getstatusoutput("groupmod -nspameggs %s" % (nonexistent)) - self.assertNotEqual(status, 0, status) # man groupmod -> 6: specified group doesn't exist - -class TestGroupdel(unittest.TestCase, ShadowUtilsTestBase): - def testCorrectGroupdel(self): - """ groupdel: Basic usage of groupdel """ - self.groupname = "test-shadow-utils-groups" - (status, output) = commands.getstatusoutput("groupadd %s" % (self.groupname)) - self.failUnlessEqual(status, 0, output) - (status, output) = commands.getstatusoutput("groupdel %s" % (self.groupname)) - self.assertEqual(status, 0, output) - - def testGroupdelNoSuchGroup(self): - """ groupdel: Remove non-existing group """ - (status, output) = commands.getstatusoutput("groupdel foobar") - self.assertNotEqual(status, 0, output) - - def testRemovePrimaryGroup(self): - """ groupdel: Remove a primary group of an user """ - username = "test-groupdel-primary" - (status, output) = commands.getstatusoutput("useradd %s" % (username)) - self.failUnlessEqual(status, 0, output) - - (status, output) = commands.getstatusoutput("groupdel %s" % (username)) - self.assertNotEqual(status, 0, output) - - # clean up - (status, output) = commands.getstatusoutput("userdel -r %s" % (username)) - self.failUnlessEqual(status, 0, output) - -class TestPwckGrpck(unittest.TestCase): - def setUp(self): - self.passwd_path = tempfile.mktemp(suffix="test-pwck-passwd") - self.passwd_file = open(self.passwd_path, "w") - self.group_path = tempfile.mktemp(suffix="test-pwck-grp") - self.group_file = open(self.group_path, "w") - self.gshadow_path = tempfile.mktemp(suffix="test-pwck-gshadow") - self.gshadow_file = open(self.gshadow_path, "w") - - def tearDown(self): - self.passwd_file.close() - self.group_file.close() - self.gshadow_file.close() - - os.remove(self.passwd_path) - os.remove(self.group_path) - os.remove(self.gshadow_path) - - def runPwckCheck(self, passwd, group): - self.passwd_file.truncate() - self.group_file.truncate() - - self.passwd_file.write(passwd) - self.passwd_file.flush() - self.group_file.write(group) - self.group_file.flush() - - command = "pwck -r %s %s" % (self.passwd_path, self.group_path) - return commands.getstatusoutput(command) - - def runGrpCheck(self, group, gshadow): - self.group_file.truncate() - self.gshadow_file.truncate() - - self.gshadow_file.write(gshadow) - self.gshadow_file.flush() - - self.group_file.write(group) - self.group_file.flush() - - command = "grpck -r %s %s" % (self.group_path, self.gshadow_path) - return commands.getstatusoutput(command) - - - def testValidEntries(self): - """ pwck: a valid entry """ - status, output = self.runPwckCheck("foo:x:685:0::/dev/null:/bin/bash", "") - rhv = RedHatVersion() - runs = rhv.get_info() - if rhv.is_rhel(): - if runs[1] < 6: - self.assertEqual(status, 0, output) - else: - self.assertNotEqual(status, 0, output) - - def testNumberOfFields(self): - """ pwck: invalid number of fields in the record """ - not_enough = "foo:x:685:685::/dev/null" - too_many = "foo:x:685:685::/dev/null:/bin/bash:comment" - status, output = self.runPwckCheck(not_enough, "") - self.assertNotEqual(status, 0, output) - - status, output = self.runPwckCheck(too_many, "") - self.assertNotEqual(status, 0, output) - - def testUniqueUserName(self): - """ pwck: unique user name in the record """ - duplicate_username = "foo:x:685:685::/dev/null:/bin/bash\nfoo:x:686:686::/dev/null:/bin/bash" - status, output = self.runPwckCheck(duplicate_username, "") - self.assertNotEqual(status, 0, output) - - def testValidID(self): - """ pwck: invalid UID in the records """ - invalid_ids = [ "foo:x:-1:685::/dev/null:/bin/bash", "foo:x:blah:685::/dev/null:/bin/bash", "foo:x:1234567890:685::/dev/null:/bin/bash" ] - for record in invalid_ids: - status, output = self.runPwckCheck(record, "") - self.assertNotEqual(status, 0, record) - - - def testValidPrimaryGroup(self): - """ pwck: invalid primary group """ - invalid_groups = [ "foo:x:685:-1::/dev/null:/bin/bash", "foo:x:685:blah::/dev/null:/bin/bash", "foo:x:685:1234567890::/dev/null:/bin/bash" ] - for record in invalid_groups: - status, output = self.runPwckCheck("", record) - self.assertNotEqual(status, 0, output) - - def testValidHomeDir(self): - """ pwck: invalid home dir """ - for record in [ "foo:x:685:685::123:/bin/bash", "foo:x:685:685::/path/to/nowhere:/bin/bash", "foo:x:685:1234567890::!:/bin/bash" ]: - status, output = self.runPwckCheck(record, "") - self.assertNotEqual(status, 0, output) - - def testBZ164954(self): - """ grpck: regression test for BZ164954 """ - record = "root:x:0:root\nbin:x:1:root,bin,daemon\ndaemon:x:2:root,bin,daemon\nsys:x:3:root,bin,adm\nadm:x:4:root,adm,daemon" - status, output = self.runGrpCheck("", record) - self.assertNotEqual(status, 0, output) - -if __name__ == "__main__": - broken_on_rhel4 = { "TestUseradd" : [ "testCustomUID", "testCustomGID" ] } - - if os.getuid() != 0: - print "This test must be run as root" - sys.exit(1) - - unittest.main() - diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 09f4769..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# This first play always runs on the local staging system -- hosts: localhost - roles: - - role: standard-test-beakerlib - tags: - - classic - - atomic - tests: - - sanity - required_packages: - - shadow-utils # sanity test needs shadow-utils - - python # sanity test needs python