Alejandro Colomar 68d42a8fbe src/usermod.c: update_group_file(): Reduce scope of local variable ...

After _every_ iteration, 'changed' is always 'false'.  We don't need to
have it outside of the loop.

See:

$ grepc update_group_file . \
| grep -e changed -e goto -e continue -e break -e free_ngrp -e '{' -e '}' \
| pcre2grep -v -M '{\n\t*}';
{
	bool                changed;
	changed = false;
	while ((grp = gr_next ()) != NULL) {
		if (!was_member && !is_member) {
			continue;
		}
		if (was_member) {
			if ((!Gflg) || is_member) {
				if (lflg) {
					changed = true;
				}
			} else {
				changed = true;
			}
		} else if (is_member) {
			changed = true;
		}
		if (!changed)
			goto free_ngrp;
		changed = false;
free_ngrp:
	}
}

This was already true in the commit that introduced the code:

$ git show 45c6603cc:src/usermod.c \
| grepc update_group \
| grep -e changed -e goto -e break -e continue -e '\<if\>' -e '{' -e '}' \
| pcre2grep -v -M '{\n\t*}';
{
	int changed;
	changed = 0;
	while ((grp = gr_next())) {
		 * See if the user specified this group as one of their
		if (!was_member && !is_member)
			continue;
		if (was_member && (!Gflg || is_member)) {
			if (lflg) {
				changed = 1;
			}
		} else if (was_member && Gflg && !is_member) {
			changed = 1;
		} else if (!was_member && Gflg && is_member) {
			changed = 1;
		}
		if (!changed)
			continue;
		changed = 0;
	}
}

Fixes: 45c6603cc8 ("[svn-upgrade] Integrating new upstream version, shadow (19990709)")
Signed-off-by: Alejandro Colomar <alx@kernel.org>

2024-05-20 09:37:01 +02:00

..

.gitignore

getsubids: system binary for user's sub*ids

2021-11-17 16:35:50 +01:00

.indent.pro

[svn-upgrade] Integrating new upstream version, shadow (4.0.8)

2007-10-07 11:46:07 +00:00

chage.c

lib/, src/: str2*(): Rename functions and reorder parameters

2024-03-29 14:29:13 -05:00

check_subid_range.c

Hardcoding Prog to known value

2024-03-07 22:23:04 +01:00

chfn.c

lib/, src/: Remove all code wrapped in defined(USE_NIS)

2024-03-14 16:12:51 -05:00

chgpasswd.c

lib/, src/: str2*(): Rename functions and reorder parameters

2024-03-29 14:29:13 -05:00

chpasswd.c

lib/, src/: str2*(): Rename functions and reorder parameters

2024-03-29 14:29:13 -05:00

chsh.c

lib/, src/: Remove all code wrapped in defined(USE_NIS)

2024-03-14 16:12:51 -05:00

expiry.c

Adding checks for fd omission

2024-03-10 19:56:40 -05:00

faillog.c

lib/, src/: str2*(): Rename functions and reorder parameters

2024-03-29 14:29:13 -05:00

free_subid_range.c

Hardcoding Prog to known value

2024-03-07 22:23:04 +01:00

get_subid_owners.c

Hardcoding Prog to known value

2024-03-07 22:23:04 +01:00

getsubids.c

Hardcoding Prog to known value

2024-03-07 22:23:04 +01:00

gpasswd.c

Adding checks for fd omission

2024-03-10 19:56:40 -05:00

groupadd.c

Hardcoding Prog to known value

2024-03-07 22:23:04 +01:00

groupdel.c

lib/, src/: Remove all code wrapped in defined(USE_NIS)

2024-03-14 16:12:51 -05:00

groupmems.c

Hardcoding Prog to known value

2024-03-07 22:23:04 +01:00

groupmod.c

lib/, src/: Remove all code wrapped in defined(USE_NIS)

2024-03-14 16:12:51 -05:00

groups.c

Hardcoding Prog to known value

2024-03-07 22:23:04 +01:00

grpck.c

Hardcoding Prog to known value

2024-03-07 22:23:04 +01:00

grpconv.c

Hardcoding Prog to known value

2024-03-07 22:23:04 +01:00

grpunconv.c

Hardcoding Prog to known value

2024-03-07 22:23:04 +01:00

id.c

lib/, src/: Use int main(void) where appropriate

2024-03-14 16:16:15 -05:00

lastlog.c

lib/, src/: str2*(): Rename functions and reorder parameters

2024-03-29 14:29:13 -05:00

login_nopam.c

src/login_nopam.c: Add missing 'const'

2023-12-04 11:45:09 +01:00

login.c

src/login.c: Use localtime_r(3) instead of localtime(3)

2024-03-24 00:16:00 +01:00

logoutd.c

Hardcoding Prog to known value

2024-03-07 22:23:04 +01:00

Makefile.am

Remove libcrack support

2023-11-25 21:24:38 -06:00

new_subid_range.c

Hardcoding Prog to known value

2024-03-07 22:23:04 +01:00

newgidmap.c

Hardcoding Prog to known value

2024-03-07 22:23:04 +01:00

newgrp.c

Adding checks for fd omission

2024-03-10 19:56:40 -05:00

newuidmap.c

Hardcoding Prog to known value

2024-03-07 22:23:04 +01:00

newusers.c

lib/, src/: str2*(): Rename functions and reorder parameters

2024-03-29 14:29:13 -05:00

nologin.c

Update licensing info

2021-12-23 19:36:50 -06:00

passwd.c

lib/, src/: str2*(): Rename functions and reorder parameters

2024-03-29 14:29:13 -05:00

pwck.c

Hardcoding Prog to known value

2024-03-07 22:23:04 +01:00

pwconv.c

Hardcoding Prog to known value

2024-03-07 22:23:04 +01:00

pwunconv.c

Hardcoding Prog to known value

2024-03-07 22:23:04 +01:00

su.c

Adding checks for fd omission

2024-03-10 19:56:40 -05:00

suauth.c

Remove superfluous casts

2023-02-09 10:03:03 -06:00

sulogin.c

src/sulogin.c: Invert logic to reduce indentation

2024-03-14 16:16:15 -05:00

useradd.c

src/useradd.c: set_defaults(): Fix FILE* leak

2024-05-18 01:15:10 +02:00

userdel.c

lib/, src/: Remove all code wrapped in defined(USE_NIS)

2024-03-14 16:12:51 -05:00

usermod.c

src/usermod.c: update_group_file(): Reduce scope of local variable

2024-05-20 09:37:01 +02:00

vipw.c

src/vipw.c: Use string literals to initialize 'Prog'

2024-03-08 10:24:15 -06:00