From 5930e270521e0e5d6a0a3877c813accbf5253051 Mon Sep 17 00:00:00 2001 From: Patrick Schleizer Date: Wed, 21 May 2025 07:05:25 -0400 Subject: [PATCH] pam-info: improve error handling https://github.com/Kicksecure/security-misc/pull/305#issuecomment-2892378246 --- usr/libexec/security-misc/pam-info | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/usr/libexec/security-misc/pam-info b/usr/libexec/security-misc/pam-info index 00cab0b..0f30faf 100755 --- a/usr/libexec/security-misc/pam-info +++ b/usr/libexec/security-misc/pam-info @@ -19,8 +19,22 @@ fi true "$0: START PHASE 2" +set -o errexit +set -o errtrace set -o pipefail +error_handler() { + exit_code="$?" + printf '%s\n' "\ +$0: ERROR: Unexpected error. +BASH_COMMAND: '$BASH_COMMAND' +exit_code: '$exit_code' +ERROR: Please report this bug." >&2 + exit 1 +} + +trap error_handler ERR + ## Named constants. pam_faillock_state_dir="/var/lib/security-misc/faillock" @@ -35,7 +49,7 @@ if [ "$PAM_USER" = "" ]; then exit 0 fi -grep_result="$(grep -- "accessfile=/etc/security/access-security-misc.conf" /etc/pam.d/common-account 2>/dev/null)" +grep_result="$(grep -- "accessfile=/etc/security/access-security-misc.conf" /etc/pam.d/common-account 2>/dev/null)" || true ## Check if grep matched something. if [ ! "$grep_result" = "" ]; then