| 1 |
Correct the enewuser call not to enforce specified UID unless |
| 2 |
ACCT_USER_ENFORCE_ID is set. |
| 3 |
|
| 4 |
Reported-by: Toralf Förster <toralf@g.o> |
| 5 |
Tested-by: Marek Szuba <marecki@g.o> |
| 6 |
Closes: https://bugs.gentoo.org/689102 |
| 7 |
Signed-off-by: Michał Górny <mgorny@g.o> |
| 8 |
--- |
| 9 |
eclass/acct-user.eclass | 5 +++-- |
| 10 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 11 |
|
| 12 |
diff --git a/eclass/acct-user.eclass b/eclass/acct-user.eclass |
| 13 |
index ec9c859aec27..60009643c144 100644 |
| 14 |
--- a/eclass/acct-user.eclass |
| 15 |
+++ b/eclass/acct-user.eclass |
| 16 |
@@ -325,8 +325,9 @@ acct-user_pkg_preinst() { |
| 17 |
debug-print-function ${FUNCNAME} "${@}" |
| 18 |
|
| 19 |
local groups=${ACCT_USER_GROUPS[*]} |
| 20 |
- enewuser -F -M "${ACCT_USER_NAME}" "${ACCT_USER_ID}" \ |
| 21 |
- "${ACCT_USER_SHELL}" "${ACCT_USER_HOME}" "${groups// /,}" |
| 22 |
+ enewuser ${ACCT_USER_ENFORCE_ID:+-F} -M "${ACCT_USER_NAME}" \ |
| 23 |
+ "${ACCT_USER_ID}" "${ACCT_USER_SHELL}" "${ACCT_USER_HOME}" \ |
| 24 |
+ "${groups// /,}" |
| 25 |
|
| 26 |
if [[ ${ACCT_USER_HOME} != /dev/null ]]; then |
| 27 |
# default ownership to user:group |
| 28 |
-- |
| 29 |
2.22.0 |
Archives