From f1af93971b7490792d8541bc790e0d8c6d787059 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 6 Sep 2019 10:28:05 +0100 Subject: gentoo resync : 06.08.2019 --- eclass/acct-user.eclass | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'eclass/acct-user.eclass') diff --git a/eclass/acct-user.eclass b/eclass/acct-user.eclass index fa4f9daef8f7..0ce7545cd1c5 100644 --- a/eclass/acct-user.eclass +++ b/eclass/acct-user.eclass @@ -7,6 +7,7 @@ # @AUTHOR: # Michael Orlitzky # Michał Górny +# @SUPPORTED_EAPIS: 7 # @BLURB: Eclass used to create and maintain a single user entry # @DESCRIPTION: # This eclass represents and creates a single user entry. The name @@ -43,7 +44,7 @@ _ACCT_USER_ECLASS=1 case ${EAPI:-0} in 7) ;; - *) die "EAPI=${EAPI} not supported";; + *) die "EAPI=${EAPI:-0} not supported";; esac inherit user @@ -107,7 +108,7 @@ readonly ACCT_USER_NAME # @REQUIRED # @DESCRIPTION: # List of groups the user should belong to. This must be a bash -# array. +# array. # << Boilerplate ebuild variables >> @@ -167,8 +168,8 @@ eislocked() { *) # NB: 'no password' and 'locked' are indistinguishable # but we also expire the account which is more clear - [[ $(getent shadow ftp | cut -d: -f2) == '!'* ]] && - [[ $(getent shadow ftp | cut -d: -f8) == 1 ]] + [[ $(getent shadow "$1" | cut -d: -f2) == '!'* ]] && + [[ $(getent shadow "$1" | cut -d: -f8) == 1 ]] ;; esac } -- cgit v1.2.3