From: Alejandro Colomar <alx@kernel.org>
Date: Sat, 2 Sep 2023 14:19:58 +0000 (+0200)
Subject: src/gpasswd.c: Reduce scope of cpp conditional
X-Git-Tag: 4.15.0-rc1~94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c1ca49be334a6583fa1b994525b23ea4b1edc59;p=thirdparty%2Fshadow.git

src/gpasswd.c: Reduce scope of cpp conditional

This prepares for the next patch, which will invert the logic of the
conditional.

Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/src/gpasswd.c b/src/gpasswd.c
index 57b9fc0b0..bab9bf193 100644
--- a/src/gpasswd.c
+++ b/src/gpasswd.c
@@ -712,7 +712,6 @@ static void check_perms (const struct group *gr)
 	} else
 #endif				/* SHADOWGRP */
 	if (!amroot) {
-#ifdef FIRST_MEMBER_IS_ADMIN
 		/*
 		 * The policy here for changing a group is that
 		 * 1) you must be root or
@@ -727,6 +726,7 @@ static void check_perms (const struct group *gr)
 		 * first group member might be just a normal user.
 		 * --marekm
 		 */
+#if defined(FIRST_MEMBER_IS_ADMIN)
 		if (gr->gr_mem[0] == NULL)
 			failure();