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@gentoo.org>
Tested-by: Marek Szuba <marecki@gentoo.org>
Closes: https://bugs.gentoo.org/689102
Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/eclass/acct-user.eclass b/eclass/acct-user.eclass
index ec9c859aec27a4707f455420b5afe29713f14978..60009643c144861292f26bb4eaae3a955a26d291 100644 (file)
--- 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