summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Zeleny <jzeleny@redhat.com>2011-10-19 03:32:11 -0400
committerStephen Gallagher <sgallagh@redhat.com>2011-10-31 08:03:27 -0400
commitaca230b70b7f9b13edc44d328178433192c965e7 (patch)
tree7034b3df33f9c57b2474fdc2848164348fd860f0
parent7fac271ccebb84743c39f553eb5ec013cf1d10aa (diff)
downloadsssd-aca230b70b7f9b13edc44d328178433192c965e7.tar.gz
sssd-aca230b70b7f9b13edc44d328178433192c965e7.tar.xz
sssd-aca230b70b7f9b13edc44d328178433192c965e7.zip
Added krb5_fast_principal to SSSDConfig API
-rw-r--r--src/config/SSSDConfig.py1
-rwxr-xr-xsrc/config/SSSDConfigTest.py9
-rw-r--r--src/config/etc/sssd.api.d/sssd-ipa.conf1
-rw-r--r--src/config/etc/sssd.api.d/sssd-krb5.conf1
4 files changed, 9 insertions, 3 deletions
diff --git a/src/config/SSSDConfig.py b/src/config/SSSDConfig.py
index 76e4112f8..2d9d448cb 100644
--- a/src/config/SSSDConfig.py
+++ b/src/config/SSSDConfig.py
@@ -119,6 +119,7 @@ option_strings = {
'krb5_lifetime' : _("Lifetime of the TGT"),
'krb5_renew_interval' : _("Time between two checks for renewal"),
'krb5_use_fast' : _("Enables FAST"),
+ 'krb5_fast_principal' : _("Selects the principal to use for FAST"),
# [provider/krb5/chpass]
'krb5_kpasswd' : _('Server where the change password service is running if not on the KDC'),
diff --git a/src/config/SSSDConfigTest.py b/src/config/SSSDConfigTest.py
index b4a1564b9..79c18bcf3 100755
--- a/src/config/SSSDConfigTest.py
+++ b/src/config/SSSDConfigTest.py
@@ -565,7 +565,8 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
'krb5_renewable_lifetime',
'krb5_lifetime',
'krb5_renew_interval',
- 'krb5_use_fast'])
+ 'krb5_use_fast',
+ 'krb5_fast_principal'])
options = domain.list_options()
@@ -717,7 +718,8 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
'krb5_renewable_lifetime',
'krb5_lifetime',
'krb5_renew_interval',
- 'krb5_use_fast']
+ 'krb5_use_fast',
+ 'krb5_fast_principal']
self.assertTrue(type(options) == dict,
"Options should be a dictionary")
@@ -879,7 +881,8 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
'krb5_renewable_lifetime',
'krb5_lifetime',
'krb5_renew_interval',
- 'krb5_use_fast'])
+ 'krb5_use_fast',
+ 'krb5_fast_principal'])
options = domain.list_options()
diff --git a/src/config/etc/sssd.api.d/sssd-ipa.conf b/src/config/etc/sssd.api.d/sssd-ipa.conf
index b366b6bcb..b5264bace 100644
--- a/src/config/etc/sssd.api.d/sssd-ipa.conf
+++ b/src/config/etc/sssd.api.d/sssd-ipa.conf
@@ -100,6 +100,7 @@ krb5_renewable_lifetime = str, None, false
krb5_lifetime = str, None, false
krb5_renew_interval = int, None, false
krb5_use_fast = str, None, false
+krb5_fast_principal = str, None, false
[provider/ipa/access]
ipa_hbac_refresh = int, None, false
diff --git a/src/config/etc/sssd.api.d/sssd-krb5.conf b/src/config/etc/sssd.api.d/sssd-krb5.conf
index 79c67aeac..993763b6e 100644
--- a/src/config/etc/sssd.api.d/sssd-krb5.conf
+++ b/src/config/etc/sssd.api.d/sssd-krb5.conf
@@ -15,6 +15,7 @@ krb5_renewable_lifetime = str, None, false
krb5_lifetime = str, None, false
krb5_renew_interval = int, None, false
krb5_use_fast = str, None, false
+krb5_fast_principal = str, None, false
[provider/krb5/access]