From: Michał Górny <mgorny@gentoo.org>
Date: Mon, 8 Jul 2019 13:06:35 +0000 (+0200)
Subject: acct-group.eclass: Do not enforce GID unless requested
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=37079e4844246bbae7fea3204c2b3e8e8e24a9a5;p=gentoo.git

acct-group.eclass: Do not enforce GID unless requested

Correct the enewgroup call not to enforce specified GID unless
ACCT_GROUP_ENFORCE_ID is set.

Reported-by: Toralf Förster <toralf@gentoo.org>
Tested-by: Marek Szuba <marecki@gentoo.org>
Closes: https://bugs.gentoo.org/689100
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---

diff --git a/eclass/acct-group.eclass b/eclass/acct-group.eclass
index ab9095979ab7..9eab00db690f 100644
--- a/eclass/acct-group.eclass
+++ b/eclass/acct-group.eclass
@@ -117,7 +117,8 @@ acct-group_pkg_pretend() {
 acct-group_pkg_preinst() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	enewgroup -F "${ACCT_GROUP_NAME}" "${ACCT_GROUP_ID}"
+	enewgroup ${ACCT_GROUP_ENFORCE_ID:+-F} "${ACCT_GROUP_NAME}" \
+		"${ACCT_GROUP_ID}"
 }
 
 fi