Fixed controls in case appropriate configs are missing

altlinux · Aug 26, 2020 · 7bdd5a0 · 7bdd5a0
1 parent e1f4d16
commit 7bdd5a0
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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}" "$*"