summaryrefslogtreecommitdiffstats
path: root/src/config
diff options
context:
space:
mode:
authorMichal Židek <mzidek@redhat.com>2015-09-07 15:19:53 +0200
committerJakub Hrozek <jhrozek@redhat.com>2015-09-23 23:08:50 +0200
commitd85be8ad409c9efa9cf9e9ab6f9c2d911b01e5c1 (patch)
treea3d63c0623cd49016f8765d79d94c80d6b0433ff /src/config
parentb4c44ebb8997d3debb33607c123ccfd9926e0cba (diff)
downloadsssd-d85be8ad409c9efa9cf9e9ab6f9c2d911b01e5c1.tar.gz
sssd-d85be8ad409c9efa9cf9e9ab6f9c2d911b01e5c1.tar.xz
sssd-d85be8ad409c9efa9cf9e9ab6f9c2d911b01e5c1.zip
PAM: Make p11_child timeout configurable
Ticket: https://fedorahosted.org/sssd/ticket/2773 Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com> Reviewed-by: Pavel Reichl <preichl@redhat.com>
Diffstat (limited to 'src/config')
-rw-r--r--src/config/SSSDConfig/__init__.py.in1
-rw-r--r--src/config/etc/sssd.api.conf1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in
index cb9c368b9..038de16d5 100644
--- a/src/config/SSSDConfig/__init__.py.in
+++ b/src/config/SSSDConfig/__init__.py.in
@@ -89,6 +89,7 @@ option_strings = {
'pam_trusted_users' : _('List of trusted uids or user\'s name'),
'pam_public_domains' : _('List of domains accessible even for untrusted users.'),
'pam_account_expired_message' : _('Message printed when user account is expired.'),
+ 'p11_child_timeout' : _('How many seconds will pam_sss wait for p11_child to finish'),
# [sudo]
'sudo_timed' : _('Whether to evaluate the time-based attributes in sudo rules'),
diff --git a/src/config/etc/sssd.api.conf b/src/config/etc/sssd.api.conf
index f28054860..72abb8b3f 100644
--- a/src/config/etc/sssd.api.conf
+++ b/src/config/etc/sssd.api.conf
@@ -59,6 +59,7 @@ get_domains_timeout = int, None, false
pam_trusted_users = str, None, false
pam_public_domains = str, None, false
pam_account_expired_message = str, None, false
+p11_child_timeout = int, None, false
[sudo]
# sudo service