commit:     b425e3571d9b64b461a916dcddfe117e78d2b1f5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  8 13:03:22 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jul  9 13:29:39 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b425e357

acct-user.eclass: Do not enforce UID unless requested

Correct the enewuser call not to enforce specified UID unless
ACCT_USER_ENFORCE_ID is set.

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

 eclass/acct-user.eclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/acct-user.eclass b/eclass/acct-user.eclass
index ec9c859aec2..60009643c14 100644
--- a/eclass/acct-user.eclass
+++ b/eclass/acct-user.eclass
@@ -325,8 +325,9 @@ acct-user_pkg_preinst() {
        debug-print-function ${FUNCNAME} "${@}"
 
        local groups=${ACCT_USER_GROUPS[*]}
-       enewuser -F -M "${ACCT_USER_NAME}" "${ACCT_USER_ID}" \
-               "${ACCT_USER_SHELL}" "${ACCT_USER_HOME}" "${groups// /,}"
+       enewuser ${ACCT_USER_ENFORCE_ID:+-F} -M "${ACCT_USER_NAME}" \
+               "${ACCT_USER_ID}" "${ACCT_USER_SHELL}" "${ACCT_USER_HOME}" \
+               "${groups// /,}"
 
        if [[ ${ACCT_USER_HOME} != /dev/null ]]; then
                # default ownership to user:group

Reply via email to