From 7bdd5a0f99513d5ee6b69e6f40bf3cad270a9553 Mon Sep 17 00:00:00 2001 From: Rustem Bapin Date: Wed, 26 Aug 2020 19:08:58 +0400 Subject: [PATCH] Fixed controls in case appropriate configs are missing --- controls/autofs-browse-mode | 5 +++++ controls/krb5-conf-ccache | 5 ++++- controls/ssh-gssapi-auth | 5 +++++ controls/sshd-allow-groups-list | 5 +++++ controls/sshd-gssapi-auth | 5 +++++ controls/sssd-ad-gpo-access-control | 5 +++++ controls/sssd-ad-gpo-ignore-unreadable | 5 +++++ controls/sssd-cache-credentials | 5 +++++ 8 files changed, 39 insertions(+), 1 deletion(-) diff --git a/controls/autofs-browse-mode b/controls/autofs-browse-mode index 9dd190d..0c9ef03 100755 --- a/controls/autofs-browse-mode +++ b/controls/autofs-browse-mode @@ -22,5 +22,10 @@ new_subst disabled \ new_summary 'Browse autofs target mountpoints' +case "$*" in +status|'') + test -f "$CONFIG" || echo "unknown" && exit 2 +esac + control_subst "${CONFIG}" "$*" diff --git a/controls/krb5-conf-ccache b/controls/krb5-conf-ccache index 22eb35d..2f0f146 100755 --- a/controls/krb5-conf-ccache +++ b/controls/krb5-conf-ccache @@ -28,7 +28,10 @@ new_help kcm 'Kerberos credential manager (requires service like sssd-kcm)' new_summary 'Kerberos client default credential cache' -test -f "$CONFIG" || exit 2 +case "$*" in +status|'') + test -f "$CONFIG" || echo "unknown" && exit 2 +esac if ! is_builtin_mode "$1"; then case "$1" in diff --git a/controls/ssh-gssapi-auth b/controls/ssh-gssapi-auth index d2ab605..8a38a8f 100755 --- a/controls/ssh-gssapi-auth +++ b/controls/ssh-gssapi-auth @@ -24,5 +24,10 @@ new_subst enabled \ '^[[:space:]]*GSSAPIAuthentication[[:space:]]+yes$' \ 's/[[:space:]#]*\(GSSAPIAuthentication\)[[:space:]]\+.*/ \1 yes/' +case "$*" in +status|'') + test -f "$CONFIG" || echo "unknown" && exit 2 +esac + control_subst "${CONFIG}" "$*" || exit 1 diff --git a/controls/sshd-allow-groups-list b/controls/sshd-allow-groups-list index 096e4df..10f365a 100755 --- a/controls/sshd-allow-groups-list +++ b/controls/sshd-allow-groups-list @@ -24,4 +24,9 @@ new_help remoteonly 'Allow SSH Access to group remote only' new_summary 'OpenSSH server list of allowed groups configuration' +case "$*" in +status|'') + test -f "$CONFIG" || echo "unknown" && exit 2 +esac + control_subst "$CONFIG" "$*" diff --git a/controls/sshd-gssapi-auth b/controls/sshd-gssapi-auth index 97a7ea0..dc29d6b 100755 --- a/controls/sshd-gssapi-auth +++ b/controls/sshd-gssapi-auth @@ -23,5 +23,10 @@ new_help default 'Disable GSSAPI authentication (Single Sign-On feature)' new_summary 'GSSAPI authentication mechanism in SSHD' +case "$*" in +status|'') + test -f "$CONFIG" || echo "unknown" && exit 2 +esac + control_subst "${CONFIG}" "$*" diff --git a/controls/sssd-ad-gpo-access-control b/controls/sssd-ad-gpo-access-control index 0a22a01..5c591cb 100755 --- a/controls/sssd-ad-gpo-access-control +++ b/controls/sssd-ad-gpo-access-control @@ -27,5 +27,10 @@ new_subst disabled \ new_summary 'SSSD option specifies the operation mode for GPO-based access control functionality' +case "$*" in +status|'') + test -f "$CONFIG" || echo "unknown" && exit 2 +esac + control_subst "${CONFIG}" "$*" diff --git a/controls/sssd-ad-gpo-ignore-unreadable b/controls/sssd-ad-gpo-ignore-unreadable index daa7a42..434319d 100755 --- a/controls/sssd-ad-gpo-ignore-unreadable +++ b/controls/sssd-ad-gpo-ignore-unreadable @@ -22,5 +22,10 @@ new_subst disabled \ new_summary 'Ignore policy for SSSD if GPO (group policy AD object) templates (GPT) are not readable for SSSD' +case "$*" in +status|'') + test -f "$CONFIG" || echo "unknown" && exit 2 +esac + control_subst "${CONFIG}" "$*" diff --git a/controls/sssd-cache-credentials b/controls/sssd-cache-credentials index 9ff2582..9058e45 100755 --- a/controls/sssd-cache-credentials +++ b/controls/sssd-cache-credentials @@ -22,5 +22,10 @@ new_subst disabled \ new_summary 'Determines SSSD user credentials are also cached in the local LDB cache' +case "$*" in +status|'') + test -f "$CONFIG" || echo "unknown" && exit 2 +esac + control_subst "${CONFIG}" "$*"